diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf650323..5e5e6c34 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,6 +108,7 @@
             android:parentActivityName=".MainActivity" />
         <activity
             android:name=".profile.ProfileActivity"
+            android:configChanges="orientation|screenSize|screenLayout"
             android:windowSoftInputMode="adjustResize|stateHidden"
             android:parentActivityName=".MainActivity" />
         <activity
@@ -117,6 +118,7 @@
         <activity
             android:name=".profile.activity.FeedActivity"
             android:label="Inbox Activity"
+            android:configChanges="orientation|screenSize|screenLayout"
             android:parentActivityName=".MainActivity" >
         </activity>
         <activity
diff --git a/app/src/main/java/ani/dantotsu/Functions.kt b/app/src/main/java/ani/dantotsu/Functions.kt
index f51b28ff..446a97b9 100644
--- a/app/src/main/java/ani/dantotsu/Functions.kt
+++ b/app/src/main/java/ani/dantotsu/Functions.kt
@@ -15,6 +15,7 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.content.res.Resources.getSystem
 import android.graphics.Bitmap
 import android.graphics.Color
@@ -182,6 +183,10 @@ fun currActivity(): Activity? {
 var loadMedia: Int? = null
 var loadIsMAL = false
 
+val Int.toPx get() = TypedValue.applyDimension(
+    TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics
+).toInt()
+
 fun initActivity(a: Activity) {
     val window = a.window
     WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -201,6 +206,7 @@ fun initActivity(a: Activity) {
             ViewCompat.getRootWindowInsets(window.decorView.findViewById(android.R.id.content))
                 ?.apply {
                     navBarHeight = this.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) navBarHeight += 48.toPx
                 }
         }
         WindowInsetsControllerCompat(
@@ -222,6 +228,7 @@ fun initActivity(a: Activity) {
                 statusBarHeight = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars()).top
                 navBarHeight =
                     windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) navBarHeight += 48.toPx
             }
         }
     if (a !is MainActivity) a.setNavigationTheme()
diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt
index 23d8e508..0b933101 100644
--- a/app/src/main/java/ani/dantotsu/MainActivity.kt
+++ b/app/src/main/java/ani/dantotsu/MainActivity.kt
@@ -467,18 +467,12 @@ class MainActivity : AppCompatActivity() {
         window.navigationBarColor = ContextCompat.getColor(this, android.R.color.transparent)
     }
 
-    private val Int.toPx get() = TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics
-    ).toInt()
-
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
+        val margin = if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) 8 else 32
         val params : ViewGroup.MarginLayoutParams =
             binding.includedNavbar.navbar.layoutParams as ViewGroup.MarginLayoutParams
-        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE)
-            params.updateMargins(bottom = 8.toPx)
-        else
-            params.updateMargins(bottom = 32.toPx)
+        params.updateMargins(bottom = margin.toPx)
     }
 
     private fun passwordAlertDialog(callback: (CharArray?) -> Unit) {
diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
index 9a528b80..a680dd63 100644
--- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt
@@ -5,6 +5,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.graphics.Rect
+import android.content.res.Configuration
 import android.os.Bundle
 import android.text.SpannableStringBuilder
 import android.util.TypedValue
@@ -24,6 +25,7 @@ import androidx.core.text.bold
 import androidx.core.text.color
 import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
@@ -105,7 +107,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
         //Ui init
 
         initActivity(this)
-        binding.mediaViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += navBarHeight }
+        binding.mediaViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = navBarHeight }
         val oldMargin = binding.mediaViewPager.marginBottom
         AndroidBug5497Workaround.assistActivity(this) {
             if (it) {
@@ -120,6 +122,9 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
                 binding.mediaTabContainer.visibility = View.VISIBLE
             }
         }
+        val navBarMargin = if (resources.configuration.orientation ==
+            Configuration.ORIENTATION_LANDSCAPE) navBarHeight else 0
+        binding.mediaTabContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> { rightMargin = navBarMargin }
         binding.mediaBanner.updateLayoutParams { height += statusBarHeight }
         binding.mediaBannerNoKen.updateLayoutParams { height += statusBarHeight }
         binding.mediaClose.updateLayoutParams<ViewGroup.MarginLayoutParams> { topMargin += statusBarHeight }
@@ -432,6 +437,14 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
         return R.id.info
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val margin = if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) navBarHeight else 0
+        val params : ViewGroup.MarginLayoutParams =
+            binding.mediaTabContainer.layoutParams as ViewGroup.MarginLayoutParams
+        params.updateMargins(right = margin)
+    }
+
     override fun onResume() {
         if (this::tabLayout.isInitialized) {
             tabLayout.selectTab(selected)
@@ -602,4 +615,4 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi
     companion object {
         var mediaSingleton: Media? = null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt
index 78867e37..668af45a 100644
--- a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt
+++ b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt
@@ -3,6 +3,7 @@ package ani.dantotsu.profile
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import android.util.TypedValue
 import android.view.View
@@ -11,6 +12,7 @@ import android.widget.PopupMenu
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
@@ -56,7 +58,9 @@ class ProfileActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListene
         setContentView(binding.root)
         screenWidth = resources.displayMetrics.widthPixels.toFloat()
         navBar = binding.profileNavBar
-        navBar.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = navBarHeight }
+        val navBarMargin = if (resources.configuration.orientation ==
+            Configuration.ORIENTATION_LANDSCAPE) 0 else navBarHeight
+        navBar.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = navBarMargin }
 
         val feedTab = navBar.createTab(R.drawable.ic_round_filter_24, "Feed")
         val profileTab = navBar.createTab(R.drawable.ic_round_person_24, "Profile")
@@ -279,6 +283,13 @@ class ProfileActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListene
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val margin = if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) 0 else navBarHeight
+        val params : ViewGroup.MarginLayoutParams = navBar.layoutParams as ViewGroup.MarginLayoutParams
+        params.updateMargins(bottom = margin)
+    }
+
     override fun onResume() {
         if (this::navBar.isInitialized) {
             navBar.selectTabAt(selected)
@@ -301,4 +312,4 @@ class ProfileActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListene
             else -> ProfileFragment.newInstance(user)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt b/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt
index 98f0492b..6a85c640 100644
--- a/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt
+++ b/app/src/main/java/ani/dantotsu/profile/activity/FeedActivity.kt
@@ -1,9 +1,11 @@
 package ani.dantotsu.profile.activity
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
@@ -28,14 +30,16 @@ class FeedActivity : AppCompatActivity() {
         binding = ActivityFeedBinding.inflate(layoutInflater)
         setContentView(binding.root)
         navBar = binding.feedNavBar
-        navBar.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin += navBarHeight }
+        val navBarMargin = if (resources.configuration.orientation ==
+            Configuration.ORIENTATION_LANDSCAPE) 0 else navBarHeight
+        navBar.updateLayoutParams<ViewGroup.MarginLayoutParams> { bottomMargin = navBarMargin }
         val personalTab = navBar.createTab(R.drawable.ic_round_person_24, "Following")
         val globalTab = navBar.createTab(R.drawable.ic_globe_24, "Global")
         navBar.addTab(personalTab)
         navBar.addTab(globalTab)
         binding.listTitle.text = getString(R.string.activities)
         binding.feedViewPager.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-            bottomMargin += navBarHeight
+            bottomMargin = navBarMargin
             topMargin += statusBarHeight
         }
         binding.listToolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> { topMargin += statusBarHeight }
@@ -61,6 +65,16 @@ class FeedActivity : AppCompatActivity() {
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val margin = if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) 0 else navBarHeight
+        val params : ViewGroup.MarginLayoutParams =
+            binding.feedViewPager.layoutParams as ViewGroup.MarginLayoutParams
+        val paramsNav : ViewGroup.MarginLayoutParams = navBar.layoutParams as ViewGroup.MarginLayoutParams
+        params.updateMargins(bottom = margin)
+        paramsNav.updateMargins(bottom = margin)
+    }
+
     override fun onResume() {
         super.onResume()
         navBar.selectTabAt(selected)
@@ -80,4 +94,4 @@ class FeedActivity : AppCompatActivity() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout-land/activity_media.xml b/app/src/main/res/layout-land/activity_media.xml
index 247c86a9..d0a94b53 100644
--- a/app/src/main/res/layout-land/activity_media.xml
+++ b/app/src/main/res/layout-land/activity_media.xml
@@ -6,71 +6,10 @@
     android:layout_height="match_parent"
     android:orientation="horizontal">
 
-    <LinearLayout
-        android:id="@+id/mediaTabContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center|bottom"
-        android:orientation="vertical">
-
-        <nl.joery.animatedbottombar.AnimatedBottomBar
-            android:id="@+id/mediaTab1"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal|bottom"
-            android:background="?attr/colorSurface"
-            android:padding="0dp"
-            app:abb_animationInterpolator="@anim/over_shoot"
-            app:abb_selectedTabType="text"
-            app:abb_textAppearance="@style/NavBarText"
-            app:itemActiveIndicatorStyle="@style/BottomNavBar"
-            app:itemIconTint="@color/tab_layout_icon"
-            app:itemRippleColor="#00000000"
-            app:itemTextAppearanceActive="@style/NavBarText"
-            app:itemTextAppearanceInactive="@style/NavBarText"
-            app:itemTextColor="@color/tab_layout_icon" />
-
-        <nl.joery.animatedbottombar.AnimatedBottomBar
-            android:id="@+id/mediaTab2"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal|bottom"
-            android:background="?attr/colorSurface"
-            android:padding="0dp"
-            app:abb_animationInterpolator="@anim/over_shoot"
-            app:abb_selectedTabType="text"
-            app:abb_textAppearance="@style/NavBarText"
-            app:itemActiveIndicatorStyle="@style/BottomNavBar"
-            app:itemIconTint="@color/tab_layout_icon"
-            app:itemRippleColor="#00000000"
-            app:itemTextAppearanceActive="@style/NavBarText"
-            app:itemTextAppearanceInactive="@style/NavBarText"
-            app:itemTextColor="@color/tab_layout_icon" />
-
-        <nl.joery.animatedbottombar.AnimatedBottomBar
-            android:id="@+id/mediaTab3"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_gravity="center_horizontal|bottom"
-            android:background="?attr/colorSurface"
-            android:padding="0dp"
-            app:abb_animationInterpolator="@anim/over_shoot"
-            app:abb_selectedTabType="text"
-            app:abb_textAppearance="@style/NavBarText"
-            app:itemActiveIndicatorStyle="@style/BottomNavBar"
-            app:itemIconTint="@color/tab_layout_icon"
-            app:itemRippleColor="#00000000"
-            app:itemTextAppearanceActive="@style/NavBarText"
-            app:itemTextAppearanceInactive="@style/NavBarText"
-            app:itemTextColor="@color/tab_layout_icon" />
-    </LinearLayout>
-
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_weight="1">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/mediaAppBar"
@@ -481,4 +420,67 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
+    <LinearLayout
+        android:id="@+id/mediaTabContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="0"
+        android:layout_gravity="center|bottom"
+        android:orientation="vertical">
+
+        <nl.joery.animatedbottombar.AnimatedBottomBar
+            android:id="@+id/mediaTab1"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center_horizontal|bottom"
+            android:background="?attr/colorSurface"
+            android:padding="0dp"
+            app:abb_animationInterpolator="@anim/over_shoot"
+            app:abb_selectedTabType="text"
+            app:abb_textAppearance="@style/NavBarText"
+            app:itemActiveIndicatorStyle="@style/BottomNavBar"
+            app:itemIconTint="@color/tab_layout_icon"
+            app:itemRippleColor="#00000000"
+            app:itemTextAppearanceActive="@style/NavBarText"
+            app:itemTextAppearanceInactive="@style/NavBarText"
+            app:itemTextColor="@color/tab_layout_icon" />
+
+        <nl.joery.animatedbottombar.AnimatedBottomBar
+            android:id="@+id/mediaTab2"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center_horizontal|bottom"
+            android:background="?attr/colorSurface"
+            android:padding="0dp"
+            app:abb_animationInterpolator="@anim/over_shoot"
+            app:abb_selectedTabType="text"
+            app:abb_textAppearance="@style/NavBarText"
+            app:itemActiveIndicatorStyle="@style/BottomNavBar"
+            app:itemIconTint="@color/tab_layout_icon"
+            app:itemRippleColor="#00000000"
+            app:itemTextAppearanceActive="@style/NavBarText"
+            app:itemTextAppearanceInactive="@style/NavBarText"
+            app:itemTextColor="@color/tab_layout_icon" />
+
+        <nl.joery.animatedbottombar.AnimatedBottomBar
+            android:id="@+id/mediaTab3"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center_horizontal|bottom"
+            android:background="?attr/colorSurface"
+            android:padding="0dp"
+            app:abb_animationInterpolator="@anim/over_shoot"
+            app:abb_selectedTabType="text"
+            app:abb_textAppearance="@style/NavBarText"
+            app:itemActiveIndicatorStyle="@style/BottomNavBar"
+            app:itemIconTint="@color/tab_layout_icon"
+            app:itemRippleColor="#00000000"
+            app:itemTextAppearanceActive="@style/NavBarText"
+            app:itemTextAppearanceInactive="@style/NavBarText"
+            app:itemTextColor="@color/tab_layout_icon" />
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_feed.xml b/app/src/main/res/layout/activity_feed.xml
index 295a8a10..6537b261 100644
--- a/app/src/main/res/layout/activity_feed.xml
+++ b/app/src/main/res/layout/activity_feed.xml
@@ -43,14 +43,13 @@
         android:id="@+id/feedViewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="72dp"
         android:layout_marginTop="48dp"
         tools:ignore="SpeakableTextPresentCheck" />
 
     <nl.joery.animatedbottombar.AnimatedBottomBar
         android:id="@+id/feedNavBar"
         android:layout_width="match_parent"
-        android:layout_height="72dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
         android:background="?attr/colorSurface"
         android:padding="0dp"
@@ -66,4 +65,4 @@
         app:itemTextAppearanceInactive="@style/NavBarText"
         app:itemTextColor="@color/tab_layout_icon" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 3f7708a6..4f9590ed 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -235,7 +235,6 @@
             android:id="@+id/mediaViewPager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="72dp"
             android:nestedScrollingEnabled="true"
             tools:ignore="SpeakableTextPresentCheck" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 5b61ea3d..b88d8778 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -276,7 +276,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="72dp"
         android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
@@ -292,7 +291,7 @@
     <nl.joery.animatedbottombar.AnimatedBottomBar
         android:id="@+id/profileNavBar"
         android:layout_width="match_parent"
-        android:layout_height="72dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|bottom"
         android:background="?attr/colorSurface"
         android:padding="0dp"