diff --git a/android/buildSrc/src/main/kotlin/BuildConfigs.kt b/android/buildSrc/src/main/kotlin/BuildConfigs.kt
index b4ac17129a..7b8368968e 100644
--- a/android/buildSrc/src/main/kotlin/BuildConfigs.kt
+++ b/android/buildSrc/src/main/kotlin/BuildConfigs.kt
@@ -2,8 +2,8 @@ object BuildConfigs {
     const val minSdk = 26
     const val compileSdk = 34
     const val targetSdk = 34
-    const val versionCode = 11
-    const val versionName = "2.0.1"
+    const val versionCode = 12
+    const val versionName = "2.0.2"
     const val applicationId = "org.smartregister.opensrp"
     const val jvmToolchain = 17
     const val kotlinCompilerExtensionVersion = "1.5.8"
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt
index 29c14d7acc..cf12ec2645 100644
--- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt
+++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt
@@ -146,7 +146,7 @@ fun TopScreenSection(
       verticalAlignment = Alignment.CenterVertically,
       horizontalArrangement = Arrangement.SpaceBetween,
     ) {
-      Row(verticalAlignment = Alignment.CenterVertically) {
+      Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(4f)) {
         Icon(
           when (toolBarHomeNavigation) {
             ToolBarHomeNavigation.OPEN_DRAWER -> Icons.Filled.Menu
@@ -169,7 +169,7 @@ fun TopScreenSection(
 
       Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.padding(start = 8.dp),
+        modifier = Modifier.padding(start = 8.dp).weight(1f),
       ) {
         SetupToolbarIcons(
           menuIcons = topScreenSection?.menuIcons,
@@ -412,7 +412,7 @@ private fun RenderMenuIcon(
 @Composable
 fun TopScreenSectionWithFilterItemOverNinetyNinePreview() {
   TopScreenSection(
-    title = "All Clients",
+    title = "All Clients All Clients All Clients All Clients All Clients",
     searchQuery = SearchQuery("Eddy"),
     filteredRecordsCount = 120,
     onSearchTextChanged = { _, _ -> },