diff --git a/mobile/app/src/main/java/com/odweta/solon/About.kt b/mobile/app/src/main/java/com/odweta/solon/About.kt
index d8978e7..61bd487 100644
--- a/mobile/app/src/main/java/com/odweta/solon/About.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/About.kt
@@ -40,9 +40,7 @@ import androidx.compose.ui.unit.sp
 @Composable
 fun AboutScreen() {
     // handle the back gesture (back swipe form side or back button on bottom android navbar)
-    BackHandler {
-        isShowing = IsShowing.Menu
-    }
+    BackHandler { global.currentScreenElement = ScreenElement.Menu }
 
     Column(
         modifier = Modifier
@@ -115,7 +113,7 @@ fun AboutTableRow(key: String, value: String, href: String = "") {
     Row(
         modifier = Modifier
             .padding(10.dp)
-            .background(color = Color.Black, shape = RoundedCornerShape(roundedCornerDimen))
+            .background(color = Color.Black, shape = RoundedCornerShape(global.dimens.roundedCorner))
             .fillMaxWidth()
     ) {
         Text(
diff --git a/mobile/app/src/main/java/com/odweta/solon/BackButtonFactory.kt b/mobile/app/src/main/java/com/odweta/solon/BackButtonFactory.kt
index 57bcf92..db45f7f 100644
--- a/mobile/app/src/main/java/com/odweta/solon/BackButtonFactory.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/BackButtonFactory.kt
@@ -45,8 +45,8 @@ fun BackButton(onClick: () -> Unit) {
             ),
             modifier = Modifier
                 .border(
-                    width = 5.dp,
-                    shape = RoundedCornerShape(roundedCornerDimen),
+                    width = global.dimens.borderWidth,
+                    shape = RoundedCornerShape(global.dimens.roundedCorner),
                     color = PastelYellow
                 )
                 .width(70.dp)
@@ -65,9 +65,9 @@ object BackButtonFactory: BackButtonFactoryInterface {
     @Composable
     override fun get(type: BackButtonType): @Composable () -> Unit {
         return when (type) {
-            BackButtonType.Menu -> { { BackButton({ isShowing = IsShowing.Menu }) } }
-            BackButtonType.MarksAll -> { { BackButton({ global.marksDepthLevel = MarksDepthLevel.All }) } }
-            BackButtonType.MarksSubject -> { { BackButton({ global.marksDepthLevel = MarksDepthLevel.Subject }) } }
+            BackButtonType.Menu -> { { BackButton { global.currentScreenElement = ScreenElement.Menu } } }
+            BackButtonType.MarksAll -> { { BackButton { global.marksDepthLevel = MarksDepthLevel.All } } }
+            BackButtonType.MarksSubject -> { { BackButton { global.marksDepthLevel = MarksDepthLevel.Subject } } }
         }
     }
 }