diff --git a/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml b/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml
index c26b0d72..231dcc73 100644
--- a/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml
@@ -2,22 +2,35 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
     android:background="@color/backgroundColor"
     android:paddingTop="8dp">
 
-    <TextView
-        android:id="@+id/createNewUser"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/adminCreateNewUser"
-        android:drawableStart="@drawable/ic_add_person"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/createNewUser"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/adminCreateNewUser"
+                android:drawableStart="@drawable/ic_add_person"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml b/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml
index a9ed7f49..b5479b50 100644
--- a/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml
@@ -2,22 +2,35 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
     android:background="@color/backgroundColor"
     android:paddingTop="8dp">
 
-    <TextView
-        android:id="@+id/adminUsers"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/adminUsers"
-        android:drawableStart="@drawable/ic_users"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/adminUsers"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/adminUsers"
+                android:drawableStart="@drawable/ic_users"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/org_bottom_sheet_layout.xml b/app/src/main/res/layout/org_bottom_sheet_layout.xml
index e2f21caa..30376ec0 100644
--- a/app/src/main/res/layout/org_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/org_bottom_sheet_layout.xml
@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
     android:background="@color/backgroundColor"
     android:paddingTop="8dp">
 
-    <TextView
-        android:id="@+id/createTeam"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/orgCreateTeam"
-        android:drawableStart="@drawable/ic_organizations"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/createTeam"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/orgCreateTeam"
+                android:drawableStart="@drawable/ic_organizations"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/profile_bottom_sheet_layout.xml b/app/src/main/res/layout/profile_bottom_sheet_layout.xml
index d50fd5ef..e833227a 100644
--- a/app/src/main/res/layout/profile_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/profile_bottom_sheet_layout.xml
@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
     android:background="@color/backgroundColor"
     android:paddingTop="8dp">
 
-    <TextView
-        android:id="@+id/addNewEmailAddress"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/profileCreateNewEmailAddress"
-        android:drawableStart="@drawable/ic_email"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/addNewEmailAddress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/profileCreateNewEmailAddress"
+                android:drawableStart="@drawable/ic_email"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/repo_bottom_sheet_layout.xml b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
index 225837ef..d08661f4 100644
--- a/app/src/main/res/layout/repo_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
@@ -1,94 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
     android:background="@color/backgroundColor"
     android:paddingTop="8dp">
 
-    <TextView
-        android:id="@+id/newFile"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/pageTitleNewFile"
-        android:drawableStart="@drawable/ic_file"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        android:layout_height="400dp">
 
-    <TextView
-        android:id="@+id/createNewIssue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/pageTitleCreateNewIssue"
-        android:drawableStart="@drawable/ic_issue_open_white"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/createNewMilestone"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/pageTitleCreateMilestone"
-        android:drawableStart="@drawable/ic_milestone"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/newFile"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/pageTitleNewFile"
+                android:drawableStart="@drawable/ic_file"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/createLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/createLabel"
-        android:drawableStart="@drawable/ic_label"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/createNewIssue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/pageTitleCreateNewIssue"
+                android:drawableStart="@drawable/ic_issue_open_white"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/createRelease"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/createRelease"
-        android:drawableStart="@drawable/ic_new_releases"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/createNewMilestone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/pageTitleCreateMilestone"
+                android:drawableStart="@drawable/ic_milestone"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/addCollaborator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/addCollaboratorTitle"
-        android:drawableStart="@drawable/ic_person_filled"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/createLabel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/createLabel"
+                android:drawableStart="@drawable/ic_label"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/openWebRepo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:drawableStart="@drawable/ic_open_in_browser"
-        android:drawablePadding="24dp"
-        android:padding="16dp"
-        android:text="@string/openWebRepo"
-        android:textColor="@color/white"
-        android:textSize="16sp" />
+            <TextView
+                android:id="@+id/createRelease"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/createRelease"
+                android:drawableStart="@drawable/ic_new_releases"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+            <View style="@style/lineDividerHorizontal" />
+
+            <TextView
+                android:id="@+id/addCollaborator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/addCollaboratorTitle"
+                android:drawableStart="@drawable/ic_person_filled"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+            <View style="@style/lineDividerHorizontal" />
+
+            <TextView
+                android:id="@+id/openWebRepo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:drawableStart="@drawable/ic_open_in_browser"
+                android:drawablePadding="24dp"
+                android:padding="16dp"
+                android:text="@string/openWebRepo"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
index 6f342b04..c6515c13 100644
--- a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
@@ -1,94 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
     android:background="@color/backgroundColor"
     android:paddingTop="8dp">
 
-    <TextView
-        android:id="@+id/replyToIssue"
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/replyToIssue"
-        android:drawableStart="@drawable/ic_reply"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        android:layout_height="400dp">
 
-    <TextView
-        android:id="@+id/editIssue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/editIssue"
-        android:drawableStart="@drawable/ic_edit"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/addRemoveAssignees"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/addRemoveAssignees"
-        android:drawableStart="@drawable/ic_person_filled"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/replyToIssue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/replyToIssue"
+                android:drawableStart="@drawable/ic_reply"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/editLabels"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/singleIssueEditLabels"
-        android:drawableStart="@drawable/ic_label"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/editIssue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/editIssue"
+                android:drawableStart="@drawable/ic_edit"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/closeIssue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/closeIssue"
-        android:drawableStart="@drawable/ic_done"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/addRemoveAssignees"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/addRemoveAssignees"
+                android:drawableStart="@drawable/ic_person_filled"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/reOpenIssue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/reOpenIssue"
-        android:drawableStart="@drawable/ic_reopen"
-        android:drawablePadding="24dp"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        android:padding="16dp" />
+            <TextView
+                android:id="@+id/editLabels"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/singleIssueEditLabels"
+                android:drawableStart="@drawable/ic_label"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
 
-    <TextView
-        android:id="@+id/copyIssueUrl"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:drawableStart="@drawable/ic_content_copy"
-        android:drawablePadding="24dp"
-        android:padding="16dp"
-        android:text="@string/copyIssueUrl"
-        android:textColor="@color/white"
-        android:textSize="16sp" />
+            <View style="@style/lineDividerHorizontal" />
+
+            <TextView
+                android:id="@+id/copyIssueUrl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:drawableStart="@drawable/ic_content_copy"
+                android:drawablePadding="24dp"
+                android:padding="16dp"
+                android:text="@string/copyIssueUrl"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+
+            <View style="@style/lineDividerHorizontal" />
+
+            <TextView
+                android:id="@+id/closeIssue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/closeIssue"
+                android:drawableStart="@drawable/ic_done"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+            <TextView
+                android:id="@+id/reOpenIssue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/reOpenIssue"
+                android:drawableStart="@drawable/ic_reopen"
+                android:drawablePadding="24dp"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2fa70ea1..d51b994a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -47,5 +47,13 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="lineDividerHorizontal">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/divider</item>
+        <item name="android:layout_marginStart">64dp</item>
+        <item name="android:layout_marginTop">10dp</item>
+        <item name="android:layout_marginBottom">10dp</item>
+    </style>
 
 </resources>