diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
index bd402b52..3506e054 100644
--- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
+++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java
@@ -12,6 +12,8 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 
 import com.google.android.material.navigation.NavigationView;
 import com.panda3ds.pandroid.AlberDriver;
@@ -47,7 +49,6 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe
         ((AppCompatTextView)view.findViewById(R.id.game_publisher)).setText(game.getPublisher());
 
         ((NavigationView)view.findViewById(R.id.action_navigation)).setNavigationItemSelectedListener(this);
-        ((NavigationView)view.findViewById(R.id.others_navigation)).setNavigationItemSelectedListener(this);
     }
 
     @Override
@@ -80,6 +81,17 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe
         }
     }
 
+    private void changeScreenOrientation() {
+    int currentOrientation = getResources().getConfiguration().orientation;
+
+    // Change the orientation
+    if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+        requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+    } else {
+        requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    }
+}
+
     @Override
     public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {}
 
@@ -106,6 +118,8 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe
             requireActivity().finish();
         } else if (id == R.id.lua_script){
             new LuaDialogFragment().show(getParentFragmentManager(), null);
+        } else if (id == R.id.change_orientation) {
+        changeScreenOrientation();
         }
 
         return false;
diff --git a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
index e2cd045d..c4a698ea 100644
--- a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
+++ b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml
@@ -1,106 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:background="?colorSurface">
 
-
+    <!-- Main content layout -->
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:minHeight="190dp"
-        android:background="?colorSurfaceVariant">
-
-        <com.google.android.material.card.MaterialCardView
-            android:layout_width="90dp"
-            android:layout_height="90dp"
-            app:cardCornerRadius="10dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp">
-
-            <com.panda3ds.pandroid.view.gamesgrid.GameIconView
-                android:id="@+id/game_icon"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?colorSurface"/>
-
-        </com.google.android.material.card.MaterialCardView>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
+        <!-- Game related content -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:gravity="center"
-            android:layout_marginBottom="20dp">
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:minHeight="190dp"
+            android:background="?colorSurfaceVariant">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/game_title"
-                android:layout_width="wrap_content"
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="90dp"
+                android:layout_height="90dp"
+                app:cardCornerRadius="10dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp">
+
+                <com.panda3ds.pandroid.view.gamesgrid.GameIconView
+                    android:id="@+id/game_icon"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?colorSurface"/>
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textColor="?colorOnSurfaceVariant"
-                android:paddingBottom="4dp"
+                android:orientation="vertical"
                 android:gravity="center"
-                android:textStyle="bold"
-                android:textSize="19sp"/>
+                android:layout_marginBottom="20dp">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/game_publisher"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textColor="?colorOnSurfaceVariant"
-                android:textSize="14sp"/>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/game_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textColor="?colorOnSurfaceVariant"
+                    android:paddingBottom="4dp"
+                    android:gravity="center"
+                    android:textStyle="bold"
+                    android:ellipsize="marquee"
+                    style="?attr/textAppearanceTitleSmall"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:singleLine="true"
+                    android:textSize="19sp"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/game_publisher"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name"
+                    android:textColor="?colorOnSurfaceVariant"
+                    android:textSize="14sp"/>
+
+            </LinearLayout>
 
         </LinearLayout>
 
     </LinearLayout>
 
-    <ScrollView
-        android:layout_width="match_parent"
+    <!-- Drawer content layout -->
+    <LinearLayout
+        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_marginTop="10dp">
+        android:orientation="vertical"
+        android:gravity="start"
+        android:layout_marginTop="195dp">
 
-        <LinearLayout
+        <com.google.android.material.navigation.NavigationView
+            android:id="@+id/action_navigation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            app:menu="@menu/game_drawer_settings"
+            android:background="?colorSurface"
+            android:theme="@style/Widget.App.NavigationView"
+            app:subheaderTextAppearance="@style/TextAppearanceGameDrawerSubTitle"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/actions"
-                style="@style/TextAppearanceGameDrawerSubTitle"/>
+    </LinearLayout>
 
-            <com.google.android.material.navigation.NavigationView
-                android:id="@+id/action_navigation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:menu="@menu/game_drawer_actions"
-                android:background="?colorSurface"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/others"
-                style="@style/TextAppearanceGameDrawerSubTitle"/>
-
-            <com.google.android.material.navigation.NavigationView
-                android:id="@+id/others_navigation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:menu="@menu/game_drawer_others"
-                android:background="?colorSurface"/>
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml b/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml
deleted file mode 100644
index 9fd3264a..00000000
--- a/src/pandroid/app/src/main/res/menu/game_drawer_actions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/resume"
-        android:icon="@drawable/ic_shortcut"
-        android:title="@string/resume"/>
-    <item
-        android:id="@+id/exit"
-        android:icon="@drawable/ic_exit"
-        android:title="@string/exit"/>
-</menu>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_others.xml b/src/pandroid/app/src/main/res/menu/game_drawer_others.xml
deleted file mode 100644
index b6dd4897..00000000
--- a/src/pandroid/app/src/main/res/menu/game_drawer_others.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/lua_script"
-        android:icon="@drawable/ic_code"
-        android:title="@string/lua_script"/>
-</menu>
\ No newline at end of file
diff --git a/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml b/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml
new file mode 100644
index 00000000..12fa6d47
--- /dev/null
+++ b/src/pandroid/app/src/main/res/menu/game_drawer_settings.xml
@@ -0,0 +1,35 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    android:divider="@null"
+    android:dividerHeight="0dp">
+    <item
+        android:id="@+id/header_actions"
+        android:title="Actions">
+      <menu>
+          
+        <item
+            android:id="@+id/resume"
+            android:icon="@drawable/ic_shortcut"
+            android:title="@string/resume" />
+        <item
+            android:id="@+id/exit"
+            android:icon="@drawable/ic_exit"
+            android:title="@string/exit"/>
+
+        </menu>
+     </item>
+     <item
+         android:id="@+id/header_others"
+         android:title="Others">
+      <menu>
+
+            <item
+                android:id="@+id/change_orientation"
+                android:icon="@drawable/ic_rotate_screen"
+                android:title="Rotate" />
+            <item
+                android:id="@+id/lua_script"
+                android:icon="@drawable/ic_code"
+                android:title="@string/lua_script" />
+     </menu>
+  </item>
+</menu>