diff --git a/app/build.gradle b/app/build.gradle
index 345dfd851920b789b8bd31c4637645ed455fd460..d7bcf7115ea55804e9964c83fa847de47b8d3919 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,13 +6,13 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 android {
-    compileSdk 34
+    compileSdk 36
     defaultConfig {
         applicationId "jp.atled.agileworks"
         minSdkVersion 24
-        targetSdk 34
-        versionCode 6
-        versionName "1.1.1"
+        targetSdk 36
+        versionCode 7
+        versionName "1.1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -33,7 +33,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
-    buildToolsVersion = '34.0.0'
+    buildToolsVersion = '36.0.0'
 
     dataBinding {
         enabled = true
@@ -58,7 +58,7 @@ dependencies {
     implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
     implementation "androidx.work:work-runtime-ktx:$workVersion"
     implementation "android.arch.lifecycle:extensions:$lifecycle_extention_version"
-    implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
+    implementation "com.google.android.gms:play-services-oss-licenses:17.2.0"
 
     // Retrofit
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
@@ -93,7 +93,7 @@ dependencies {
 
     implementation "com.journeyapps:zxing-android-embedded:$zxing_version"
 
-    implementation "com.google.android.material:material:1.1.0"
+    implementation "com.google.android.material:material:1.2.0"
 }
 
 repositories {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b424510da51fd82143bc74a0a801ae5a1e2fcd..04e5470a5fa4fe9dd638705710e3d218a541b964 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,14 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#sdk36対応時bundleを作れなかった対応
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c4d99fe48def7d807cbe659f4829d78cf7b9af33..3941c6027bcd696113a784fd1e4a64efe4ca8b8e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
+        android:enableOnBackInvokedCallback="false"
         tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".view.ui.login.LoginActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|uiMode"
@@ -42,7 +43,8 @@
             android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity android:name=".widget.AwAppWidgetConfiguration"
-            android:exported="false">
+            android:exported="false"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
             </intent-filter>
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt b/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
index d4326e25db18cb0ae7d277354818f22201e508bb..036635ee4710b71eb48af3fe1dd720d5c78ac800 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/DirectOpenDocumentActivity.kt
@@ -17,6 +17,8 @@ import jp.atled.agileworks.view.utils.putNonNullStingFromExtra
 import android.view.KeyEvent
 import android.view.View
 import android.widget.Button
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import jp.atled.agileworks.model.LoginRepository
 import jp.atled.agileworks.model.ServerRepository
 import jp.atled.agileworks.databinding.ActivityDirectOpenDocumentBinding
@@ -52,6 +54,29 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
         setSupportActionBar(binding.toolbar)
         setupDrawerMenu()
         findViewById<Button>(R.id.close_btn).setOnClickListener(this);
+        ViewCompat.setOnApplyWindowInsetsListener(binding.directOpenDocumentContent) { view, insets ->
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val displayCutoutInsets = insets.getInsets(WindowInsetsCompat.Type.displayCutout()) // カットアウト情報を取得
+
+            // パディングの計算
+            val leftPadding = maxOf(systemBarsInsets.left, displayCutoutInsets.left)
+            val topPadding = maxOf(systemBarsInsets.top, displayCutoutInsets.top)
+            val rightPadding = maxOf(systemBarsInsets.right, displayCutoutInsets.right)
+            val bottomPadding = maxOf(systemBarsInsets.bottom, displayCutoutInsets.bottom)
+
+            view.setPadding(
+                leftPadding,
+                topPadding,
+                rightPadding,
+                bottomPadding
+            )
+            insets
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(binding.navigationDrawer) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setPadding(systemBars.left, view.paddingTop, view.paddingRight, view.paddingBottom)
+            insets
+        }
 
         supportFragmentManager.beginTransaction()
                 .replace(R.id.direct_open_webview_fragment, documentWebFragment())
@@ -62,17 +87,10 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
         if (firstServer != tapServer) {
             createDialog().show()
         } else {
-            closeTapped()
+            finish()
         }
     }
 
-    private fun closeTapped(){
-        var event = KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK)
-        dispatchKeyEvent(event)
-        event = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK)
-        dispatchKeyEvent(event)
-    }
-
     private fun title() = intent.getStringExtra("title") ?: ""
 
     private fun url() = intent.getStringExtra("url") ?: ""
@@ -99,7 +117,7 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
                 override fun onClick(dialogInterface: DialogInterface, i: Int) {
                     Log.d(TAG, "alert dialog click positive")
                     ServerRepository().changeServerList(tapServer)
-                    closeTapped()
+                    finish()
                     MainActivity.start(context, null)
                 }
             })
@@ -107,7 +125,7 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
                 override fun onClick(dialogInterface: DialogInterface, i: Int) {
                     Log.d(TAG, "alert dialog click negative")
                     ServerRepository().setServer(firstServer)
-                    closeTapped()
+                    finish()
                 }
             })
             .create()
@@ -117,6 +135,13 @@ class DirectOpenDocumentActivity : BaseActivity(), View.OnClickListener {
 
     private fun setupDrawerMenu() {
         DrawerMenu.setup(this, binding.drawerLayout, binding.navigationDrawer)
+        val navigationView = binding.navigationDrawer
+        val headerView = navigationView.getHeaderView(0)
+        ViewCompat.setOnApplyWindowInsetsListener(headerView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setPadding(view.paddingLeft, systemBars.top, view.paddingRight, view.paddingBottom)
+            insets
+        }
         binding.appVerLabel.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
         val actionBarDrawerToggle = ActionBarDrawerToggle(this, binding.drawerLayout, binding.toolbar, R.string.drawer_open_desc, R.string.drawer_close_desc)
         binding.drawerLayout.addDrawerListener(actionBarDrawerToggle)
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt b/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
index d6856f433370d7677e89e7e20c6db730d18a168a..3a42d427114eaefd2baf99e38f0c17a98df88a06 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/MainActivity.kt
@@ -18,6 +18,8 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.ActionBar
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.navigation.NavController
@@ -56,6 +58,35 @@ class MainActivity : BaseActivity() {
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM)
         DrawerMenu.setup(this, binding.drawerLayout, binding.navigationDrawer)
+        val navigationView = binding.navigationDrawer
+        val headerView = navigationView.getHeaderView(0)
+        ViewCompat.setOnApplyWindowInsetsListener(binding.mainContent) { view, insets ->
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val displayCutoutInsets = insets.getInsets(WindowInsetsCompat.Type.displayCutout()) // カットアウト情報を取得
+
+            // パディングの計算
+            val leftPadding = maxOf(systemBarsInsets.left, displayCutoutInsets.left)
+            val topPadding = maxOf(systemBarsInsets.top, displayCutoutInsets.top)
+            val rightPadding = maxOf(systemBarsInsets.right, displayCutoutInsets.right)
+
+            view.setPadding(
+                leftPadding,
+                topPadding,
+                rightPadding,
+                0
+            )
+            insets
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(headerView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setPadding(view.paddingLeft, systemBars.top, view.paddingRight, view.paddingBottom)
+            insets
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(navigationView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setPadding(systemBars.left, view.paddingTop, view.paddingRight, view.paddingBottom)
+            insets
+        }
         binding.appVerLabel.text = getString(R.string.app_ver_format, BuildConfig.VERSION_NAME)
         setupNotification()
 
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt b/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt
index f88b25dca3d22968b79c5caceb8ad1034bf13068..c9920bed156c6a9b41081fc8e81dce323b31e1c1 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/NavigationExtensions.kt
@@ -194,7 +194,7 @@ private fun BottomNavigationView.setupItemReselected(
         viewModel.reselectBottomNavigationItem(item.itemId)
         // Pop the back stack to the start destination of the current navController graph
         navController.popBackStack(
-            navController.graph.startDestination, false
+            navController.graph.startDestinationId, false
         )
     }
 }
diff --git a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
index c44f021677cc2e7a72b4deeb2756b442f32c6fc4..a88f7d5ff5f71c0f5b2c3b6c873baa3cb92f3cda 100644
--- a/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
+++ b/app/src/main/java/jp/atled/agileworks/view/ui/login/LoginFragment.kt
@@ -14,6 +14,8 @@ import android.widget.*
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
@@ -90,6 +92,24 @@ class LoginFragment: Fragment() {
         setupObservers()
 
         mOAuthService.initAuthService(requireContext());
+        ViewCompat.setOnApplyWindowInsetsListener(binding.snackbarArea) { view, insets ->
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val displayCutoutInsets = insets.getInsets(WindowInsetsCompat.Type.displayCutout()) // カットアウト情報を取得
+
+            // パディングの計算
+            val leftPadding = maxOf(systemBarsInsets.left, displayCutoutInsets.left)
+            val topPadding = maxOf(systemBarsInsets.top, displayCutoutInsets.top)
+            val rightPadding = maxOf(systemBarsInsets.right, displayCutoutInsets.right)
+            val bottomPadding = maxOf(systemBarsInsets.bottom, displayCutoutInsets.bottom)
+
+            view.setPadding(
+                leftPadding,
+                topPadding,
+                rightPadding,
+                bottomPadding
+            )
+            insets
+        }
 
         return binding.root
     }
diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetConfiguration.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetConfiguration.kt
index 1c1a01d37838caf440c34c22e7fc971f8ea27a74..668bb12475a550e90394d3fec6cb080ce6bb299d 100644
--- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetConfiguration.kt
+++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetConfiguration.kt
@@ -12,6 +12,7 @@ import android.widget.ListView
 import android.widget.RemoteViews
 import android.widget.TextView
 import androidx.annotation.LayoutRes
+import androidx.appcompat.widget.Toolbar
 import jp.atled.agileworks.AwApp
 import jp.atled.agileworks.R
 import jp.atled.agileworks.model.LoginRepository
@@ -35,7 +36,9 @@ class AwAppWidgetConfiguration : AppCompatActivity() {
         setResult(Activity.RESULT_CANCELED, resultValue)
 
         setContentView(R.layout.activity_aw_app_widget_configuration)
-        title = AwApp.instance.resources.getString(R.string.server)
+        val toolbar: Toolbar = findViewById(R.id.widget_toolbar) // XMLで定義したToolbarのID
+        setSupportActionBar(toolbar)
+        supportActionBar?.title = AwApp.instance.resources.getString(R.string.server)
 
         val serverListData = getServerListData()
         val textView = this.findViewById<TextView>(R.id.not_logged_in_text)
diff --git a/app/src/main/res/layout/activity_aw_app_widget_configuration.xml b/app/src/main/res/layout/activity_aw_app_widget_configuration.xml
index 57bc1538bd846fcd64f9bb722861458e0ec63303..9b49d0cde24dc7be3274e130a723b116c7c8ec4d 100644
--- a/app/src/main/res/layout/activity_aw_app_widget_configuration.xml
+++ b/app/src/main/res/layout/activity_aw_app_widget_configuration.xml
@@ -4,22 +4,41 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".widget.AwAppWidgetConfiguration">
-    <FrameLayout
+    tools:context=".widget.AwAppWidgetConfiguration"
+    android:background="?attr/colorPrimary"
+    android:fitsSystemWindows="true">
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <TextView
-            android:id="@+id/not_logged_in_text"
-            android:text="@string/NotLogedin"
-            android:textSize="18sp"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/widget_toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:title=""
+            app:titleTextColor="@android:color/white"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
 
-        <ListView
-            android:id="@+id/widget_serverListView"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="20dp"/>
-    </FrameLayout>
+            android:background="@color/white">
+            <TextView
+                android:id="@+id/not_logged_in_text"
+                android:text="@string/NotLogedin"
+                android:textSize="18sp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <ListView
+                android:id="@+id/widget_serverListView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="20dp"/>
+        </FrameLayout>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_direct_open_document.xml b/app/src/main/res/layout/activity_direct_open_document.xml
index ce26c96edfbe89fc7dc3563ead5dbd25d49df33e..a231e6eb14f461ae4f72442772e989cafe9fb63d 100644
--- a/app/src/main/res/layout/activity_direct_open_document.xml
+++ b/app/src/main/res/layout/activity_direct_open_document.xml
@@ -10,12 +10,14 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/direct_open_document_content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/colorPrimary">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:background="?attr/colorPrimary">
 
             <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
@@ -46,7 +48,8 @@
                 android:id="@+id/direct_open_webview_fragment"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1" />
+                android:layout_weight="1"
+                android:background="@color/white"/>
 
         </LinearLayout>
 
@@ -71,6 +74,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
+                android:fitsSystemWindows="true"
                 android:text=""
                 android:textAlignment="textEnd" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index dcbd25bcb70954b4cde793ed1d6adb554c50544c..fae20b96053078cbc60fc8fed5ab73c30f01a6be 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -3,7 +3,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:fillViewport="true">
         <FrameLayout
             android:id="@+id/frameLayout"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a9d8f274c32a92552a55f1c34c2bc7dd8d0b9147..6a701119a7ca1c1ece7a11968b0687d3de6b7685 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,12 +10,14 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/main_content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?attr/colorPrimary">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:background="?attr/colorPrimary">
 
             <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
@@ -71,6 +73,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginBottom="?attr/actionBarSize"
+                android:background="@color/white"
                 android:layout_weight="1" />
 
         </LinearLayout>
@@ -109,6 +112,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
+                android:fitsSystemWindows="true"
                 android:text=""
                 android:textAlignment="textEnd" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/drawer_header_layout.xml b/app/src/main/res/layout/drawer_header_layout.xml
index da94a0f2ea3ef4b65324280d48c573ec61bd8634..dbf54571450bf4b4473465f5943b645b95f83d22 100644
--- a/app/src/main/res/layout/drawer_header_layout.xml
+++ b/app/src/main/res/layout/drawer_header_layout.xml
@@ -3,37 +3,45 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/colorPrimary"
     >
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_marginTop="10sp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        >
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_marginTop="10sp"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="75dp"
-            android:layout_height="91dp"
-            app:srcCompat="@drawable/ic_aw_logo_login" />
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="75dp"
+                android:layout_height="91dp"
+                app:srcCompat="@drawable/ic_aw_logo_login" />
 
+            <TextView
+                android:id="@+id/userName"
+                android:layout_width="258dp"
+                android:layout_height="29dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/_18sp"
+                android:layout_weight="5"
+                android:textColor="@color/main_text_color"
+                android:textSize="24sp" />
+        </LinearLayout>
         <TextView
-            android:id="@+id/userName"
-            android:layout_width="258dp"
-            android:layout_height="29dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/_18sp"
-            android:layout_weight="5"
+            android:id="@+id/server_Name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:textColor="@color/main_text_color"
-            android:textSize="24sp" />
+            android:textSize="18sp"/>
     </LinearLayout>
-    <TextView
-        android:id="@+id/server_Name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:textColor="@color/main_text_color"
-        android:textSize="18sp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 1b4d1421bc8d3edd71df5a1ef3ef9ce1d2ad5860..5b732c34a5b2afbc1044c9a452983dd067c172c9 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -11,197 +11,206 @@
         android:id="@+id/snackbarArea"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="0dp" >
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary">
-
-            <Button
-                android:id="@+id/close_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="#00000000"
-                android:textColor="#ffffffff"
-                android:layout_gravity="right"
-                android:layout_centerVertical="true"
-                android:text="@string/notification_channel_close" />
-        </androidx.appcompat.widget.Toolbar>
+        android:paddingBottom="0dp"
+        android:background="?attr/colorPrimary">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:orientation="vertical">
-
-            <RelativeLayout
+            android:orientation="vertical"
+            android:background="@color/white">
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:orientation="vertical">
 
-                <ImageView
-                    android:id="@+id/login_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:adjustViewBounds="true"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="100sp"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_aw_logo_login" />
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-                <TextView
-                    android:id="@+id/app_ver_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignEnd="@+id/login_image"
-                    android:layout_below="@+id/login_image"
-                    android:text="" />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="40sp"
-                android:layout_marginEnd="10dp"
-                >
+                    <ImageView
+                        android:id="@+id/login_image"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:adjustViewBounds="true"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginTop="100sp"
+                        android:layout_marginEnd="16dp"
+                        android:src="@drawable/ic_aw_logo_login" />
+
+                    <TextView
+                        android:id="@+id/app_ver_label"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignEnd="@+id/login_image"
+                        android:layout_below="@+id/login_image"
+                        android:text="" />
+                </RelativeLayout>
 
-                <TextView
-                    android:id="@+id/serverUrl_httpsLabel"
-                    android:layout_width="wrap_content"
+                <RelativeLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignBaseline="@id/serverUrl_field"
-                    android:text="@string/login_https_label"
-                    android:textSize="18sp" />
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="40sp"
+                    android:layout_marginEnd="10dp"
+                    >
 
-                <jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline
-                    android:id="@+id/serverUrl_field"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginStart="0dp"
-                    android:layout_marginEnd="0dp"
-                    android:layout_toEndOf="@+id/serverUrl_httpsLabel"
-                    android:layout_alignWithParentIfMissing="true"
-                    android:hint="@string/login_server_url_hint">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/serverUrl"
+                    <TextView
+                        android:id="@+id/serverUrl_httpsLabel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:ems="9"
-                        android:inputType="textVisiblePassword"
-                        android:imeOptions="flagForceAscii"
-                        android:text="@={viewmodel.serverUrlLive}"
+                        android:layout_alignBaseline="@id/serverUrl_field"
+                        android:text="@string/login_https_label"
                         android:textSize="18sp" />
-                </jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline>
 
-                <TextView
-                    android:id="@+id/server_context_separation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toEndOf="@+id/serverUrl_field"
-                    android:layout_marginTop="@dimen/_25dp"
-                    android:text="@string/login_server_context_separation"
-                    android:textSize="18sp" />
-
-                <jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline
-                    android:id="@+id/server_context_field"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginStart="0dp"
-                    android:layout_marginEnd="0dp"
-                    android:layout_toEndOf="@+id/server_context_separation"
-                    android:layout_alignWithParentIfMissing="true"
-                    android:hint="@string/login_context_hint">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/server_context"
+                    <jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline
+                        android:id="@+id/serverUrl_field"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:ems="6"
-                        android:inputType="textVisiblePassword"
-                        android:imeOptions="flagForceAscii"
-                        android:text="@={viewmodel.serverContextLive}"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginEnd="0dp"
+                        android:layout_toEndOf="@+id/serverUrl_httpsLabel"
+                        android:layout_alignWithParentIfMissing="true"
+                        android:hint="@string/login_server_url_hint">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/serverUrl"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:ems="9"
+                            android:inputType="textVisiblePassword"
+                            android:imeOptions="flagForceAscii"
+                            android:text="@={viewmodel.serverUrlLive}"
+                            android:textSize="18sp" />
+                    </jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline>
+
+                    <TextView
+                        android:id="@+id/server_context_separation"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_toEndOf="@+id/serverUrl_field"
+                        android:layout_marginTop="@dimen/_25dp"
+                        android:text="@string/login_server_context_separation"
                         android:textSize="18sp" />
-                </jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline>
 
-            </RelativeLayout>
-
-            <Button
-                android:id="@+id/loginButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="10sp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:textColor="@color/button_text"
-                android:background="@drawable/style_button"
-                android:enabled="false"
-                android:text="@string/login_button" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="40sp"
-                android:layout_marginEnd="16dp">
+                    <jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline
+                        android:id="@+id/server_context_field"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginStart="0dp"
+                        android:layout_marginEnd="0dp"
+                        android:layout_toEndOf="@+id/server_context_separation"
+                        android:layout_alignWithParentIfMissing="true"
+                        android:hint="@string/login_context_hint">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/server_context"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:ems="6"
+                            android:inputType="textVisiblePassword"
+                            android:imeOptions="flagForceAscii"
+                            android:text="@={viewmodel.serverContextLive}"
+                            android:textSize="18sp" />
+                    </jp.atled.agileworks.view.ui.layout.TextInputLayoutWithBaseline>
+
+                </RelativeLayout>
 
-                <TextView
-                    android:id="@+id/clientCertInfo"
-                    android:layout_width="wrap_content"
+                <Button
+                    android:id="@+id/loginButton"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_toStartOf="@id/clientCertChoiceButton"
-                    android:layout_alignBaseline="@id/clientCertChoiceButton"
-                    android:layout_marginEnd="@dimen/_5dp"
-                    android:ellipsize="end"
-                    android:gravity="end"
-                    android:textColor="@color/main_text_color"
-                    android:text="@string/login_client_cert_initializing" />
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="10sp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:textColor="@color/button_text"
+                    android:background="@drawable/style_button"
+                    android:enabled="false"
+                    android:text="@string/login_button" />
 
-                <Button
-                    android:id="@+id/clientCertChoiceButton"
-                    android:layout_width="wrap_content"
+                <RelativeLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:text="@string/login_client_cert_choice_button_label" />
-            </RelativeLayout>
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="40sp"
+                    android:layout_marginEnd="16dp">
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="20sp"
-                android:layout_marginEnd="16dp">
+                    <TextView
+                        android:id="@+id/clientCertInfo"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_toStartOf="@id/clientCertChoiceButton"
+                        android:layout_alignBaseline="@id/clientCertChoiceButton"
+                        android:layout_marginEnd="@dimen/_5dp"
+                        android:ellipsize="end"
+                        android:gravity="end"
+                        android:textColor="@color/main_text_color"
+                        android:text="@string/login_client_cert_initializing" />
+
+                    <Button
+                        android:id="@+id/clientCertChoiceButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:text="@string/login_client_cert_choice_button_label" />
+                </RelativeLayout>
 
-                <TextView
-                    android:id="@+id/qrCodeText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentStart="true"
-                    android:layout_toStartOf="@id/qrReadButton"
-                    android:layout_alignBaseline="@id/qrReadButton"
-                    android:layout_marginEnd="@dimen/_5dp"
-                    android:ellipsize="end"
-                    android:gravity="end"
-                    android:textColor="@color/main_text_color"
-                    android:text="@string/login_qr_read_label" />
-                <Button
-                    android:id="@+id/qrReadButton"
-                    android:layout_width="wrap_content"
+                <RelativeLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:text="@string/login_qr_read_button_label" />
-            </RelativeLayout>
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="20sp"
+                    android:layout_marginEnd="16dp">
 
+                    <TextView
+                        android:id="@+id/qrCodeText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_toStartOf="@id/qrReadButton"
+                        android:layout_alignBaseline="@id/qrReadButton"
+                        android:layout_marginEnd="@dimen/_5dp"
+                        android:ellipsize="end"
+                        android:gravity="end"
+                        android:textColor="@color/main_text_color"
+                        android:text="@string/login_qr_read_label" />
+                    <Button
+                        android:id="@+id/qrReadButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:text="@string/login_qr_read_button_label" />
+                </RelativeLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp" />
+            </LinearLayout>
         </LinearLayout>
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary">
+
+            <Button
+                android:id="@+id/close_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="#00000000"
+                android:textColor="#ffffffff"
+                android:layout_gravity="right"
+                android:layout_centerVertical="true"
+                android:text="@string/notification_channel_close" />
+        </androidx.appcompat.widget.Toolbar>
         <ProgressBar
             android:id="@+id/progress_bar"
             android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index c0aa401192431aecc0bc6425c7e32766579398e3..3228a51e635051730cd6fe31b8584bf4df2ae225 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,13 +3,13 @@
 buildscript {
     ext{
         kotlin_version = '1.8.20'
-        nav_version = '2.3.2'
+        nav_version = '2.5.0'
         workVersion = '2.7.0'
         anko_version = '0.10.8'
         retrofit_version = '2.8.1'
         coroutines_version = '1.3.7'
         moshi_version = '1.15.0'
-        google_services_version= '4.3.3'
+        google_services_version= '4.4.2'
         firebase_analytics_version = '18.0.0'
         firebase_messaging_version = '23.0.0'
         constraint_layout_version = '2.0.4'
@@ -22,7 +22,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
         classpath "com.google.gms:google-services:$google_services_version"
diff --git a/gradle.properties b/gradle.properties
index 33a260477c503ab8ff969784c0193e8cbb62b92a..ae0c238980e241c8e3e5cb8fbd01a3ba7bfc2cd7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,3 +18,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 org.gradle.warning.mode=all
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 98188097212e20e44f260c7395192a4771e7742d..6dbf5da1a831d23e8e5eafb97e4373873ec70d63 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 #distributionUrl=gradle-7.0.2-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip