diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java b/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java
index 2b13b11eecf..6083fb12d3b 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java
@@ -12,6 +12,7 @@
 import android.view.WindowManager;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
+import android.widget.LinearLayout;
 
 import com.reactnativenavigation.views.TopBar;
 
@@ -118,7 +119,7 @@ public void animateShowTopBar(final TopBar topBar, final View container) {
 		containerHeightAnim.setDuration(DURATION_TOPBAR);
 		containerHeightAnim.addUpdateListener(valueAnimator -> {
             int val = (Integer) valueAnimator.getAnimatedValue();
-            ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
+			ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
             layoutParams.height = val;
             container.setLayoutParams(layoutParams);
         });
@@ -164,7 +165,7 @@ public void animateHideTopBar(final TopBar topBar, final View container) {
 		containerHeightAnim.setDuration(DURATION_TOPBAR);
 		containerHeightAnim.addUpdateListener(valueAnimator -> {
             int val = (Integer) valueAnimator.getAnimatedValue();
-            ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
+			ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
             layoutParams.height = val;
             container.setLayoutParams(layoutParams);
         });
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java b/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java
index 317b4ce3ab1..632adfa4dbf 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java
@@ -26,14 +26,10 @@ public ReactView(final Context context, ReactInstanceManager reactInstanceManage
 	}
 
 	private void start() {
-		setEventListener(new ReactRootView.ReactRootViewEventListener() {
-
-			@Override
-			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
-				reactRootView.setEventListener(null);
-				isAttachedToReactInstance = true;
-			}
-		});
+		setEventListener(reactRootView -> {
+            reactRootView.setEventListener(null);
+            isAttachedToReactInstance = true;
+        });
 		final Bundle opts = new Bundle();
 		opts.putString("containerId", containerId);
 		startReactApplication(reactInstanceManager, containerName, opts);
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java
index 3c78e44d342..481bbf65a29 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java
@@ -89,7 +89,7 @@ protected View createView() {
 	@Override
 	public void mergeNavigationOptions(NavigationOptions options) {
 		navigationOptions.mergeWith(options);
-        container.applyOptions(options);
+        container.applyOptions(navigationOptions);
 	}
 
 	NavigationOptions getNavigationOptions() {
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java b/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java
index 9111859db7a..bdef47524f2 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java
@@ -21,7 +21,7 @@ public ContainerLayout(Context context, IReactView reactView) {
 		super(context);
 		this.topBar = new TopBar(context);
 		this.reactView = reactView;
-        optionsPresenter = new OptionsPresenter(topBar, this);
+        optionsPresenter = new OptionsPresenter(topBar, reactView.asView());
         initViews();
 	}
 
@@ -61,7 +61,7 @@ public void applyOptions(NavigationOptions options) {
         optionsPresenter.applyOptions(options);
     }
 
-    @Override
+	@Override
     @RestrictTo(RestrictTo.Scope.TESTS)
     public TopBar getTopBar() {
         return topBar;
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java b/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java
index 55ee7d60c4c..9de4547ca82 100644
--- a/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java
+++ b/lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java
@@ -27,7 +27,7 @@ public TopTabsLayout(Context context, List<TopTabController> tabs) {
         topBar = new TopBar(context);
         this.tabs = tabs;
         viewPager = new TopTabsViewPager(context, tabs);
-        optionsPresenter = new OptionsPresenter(topBar, this);
+        optionsPresenter = new OptionsPresenter(topBar, viewPager);
         initViews();
     }
 
diff --git a/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java b/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java
index 4d78a037c86..c37669e0fb3 100644
--- a/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java
+++ b/lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java
@@ -16,7 +16,7 @@ public class TestContainerLayout extends View implements ReactContainer {
     public TestContainerLayout(final Context context) {
 		super(context);
         topBar = new TopBar(context);
-        optionsPresenter = new OptionsPresenter(topBar, this);
+        optionsPresenter = new OptionsPresenter(topBar, new View(context));
     }
 
     public TopBar getTopBar() {