diff --git a/app/build.gradle b/app/build.gradle
index 9d59b16..98d6261 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,8 @@ android {
         applicationId "zechs.drive.stream"
         minSdk 28
         targetSdk 32
-        versionCode 4
-        versionName "1.0.3"
+        versionCode 5
+        versionName "1.1.0"
         archivesBaseName = "${applicationId}-${versionCode}"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/zechs/drive/stream/data/remote/DriveHelper.kt b/app/src/main/java/zechs/drive/stream/data/remote/DriveHelper.kt
index 905b5ba..7217fd0 100755
--- a/app/src/main/java/zechs/drive/stream/data/remote/DriveHelper.kt
+++ b/app/src/main/java/zechs/drive/stream/data/remote/DriveHelper.kt
@@ -5,6 +5,9 @@ import android.content.Intent
 import android.util.Log
 import com.google.android.gms.auth.GoogleAuthUtil
 import com.google.android.gms.auth.api.signin.GoogleSignIn
+import com.google.android.gms.auth.api.signin.GoogleSignInClient
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.Scopes
 import com.google.android.gms.common.api.Scope
 import com.google.api.client.extensions.android.http.AndroidHttp
 import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
@@ -35,6 +38,17 @@ class DriveHelper @Inject constructor(
     var hasSignedIn = false
         private set
 
+
+    fun getClient(): GoogleSignInClient {
+        val signInOptions = GoogleSignInOptions
+            .Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+            .requestScopes(Scope(Scopes.DRIVE_FULL))
+            .requestEmail()
+            .build()
+
+        return GoogleSignIn.getClient(context, signInOptions)
+    }
+
     /**
      * Public method to send intent result from
      * Google Sign-in flow
diff --git a/app/src/main/java/zechs/drive/stream/ui/home/HomeFragment.kt b/app/src/main/java/zechs/drive/stream/ui/home/HomeFragment.kt
index 25c4576..101e8f4 100644
--- a/app/src/main/java/zechs/drive/stream/ui/home/HomeFragment.kt
+++ b/app/src/main/java/zechs/drive/stream/ui/home/HomeFragment.kt
@@ -5,13 +5,21 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import zechs.drive.stream.R
 import zechs.drive.stream.databinding.FragmentHomeBinding
 import zechs.drive.stream.ui.BaseFragment
 import zechs.drive.stream.utils.ext.navigateSafe
 
+
 class HomeFragment : BaseFragment() {
 
     companion object {
@@ -21,6 +29,8 @@ class HomeFragment : BaseFragment() {
     private var _binding: FragmentHomeBinding? = null
     private val binding get() = _binding!!
 
+    private val viewModel by activityViewModels<HomeViewModel>()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -75,6 +85,8 @@ class HomeFragment : BaseFragment() {
 
         }
 
+        setupToolbar()
+        observeLogOutState()
     }
 
     private fun <T : MaterialButton> navigateToFiles(
@@ -90,6 +102,41 @@ class HomeFragment : BaseFragment() {
         }
     }
 
+    private fun setupToolbar() {
+        binding.toolbar.setOnMenuItemClickListener { item ->
+            if (item.itemId == R.id.action_logOut) {
+                MaterialAlertDialogBuilder(context!!)
+                    .setTitle(getString(R.string.log_out_dialog_title))
+                    .setNegativeButton(getString(R.string.no)) { dialog, _ ->
+                        dialog.dismiss()
+                    }
+                    .setPositiveButton(getString(R.string.yes)) { dialog, _ ->
+                        dialog.dismiss()
+                        Log.d(TAG, "Logging out...")
+                        viewModel.logOut()
+                    }
+                    .show()
+                return@setOnMenuItemClickListener true
+            }
+            return@setOnMenuItemClickListener false
+        }
+    }
+
+    private fun observeLogOutState() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.hasLoggedOut.collect {
+                    if (it) {
+                        // restart activity
+                        activity!!.finish()
+                        delay(250L)
+                        activity!!.startActivity(activity!!.intent)
+                    }
+                }
+            }
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
diff --git a/app/src/main/java/zechs/drive/stream/ui/home/HomeViewModel.kt b/app/src/main/java/zechs/drive/stream/ui/home/HomeViewModel.kt
new file mode 100644
index 0000000..26dccce
--- /dev/null
+++ b/app/src/main/java/zechs/drive/stream/ui/home/HomeViewModel.kt
@@ -0,0 +1,29 @@
+package zechs.drive.stream.ui.home
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import zechs.drive.stream.data.remote.DriveHelper
+import javax.inject.Inject
+
+@HiltViewModel
+class HomeViewModel @Inject constructor(
+    private val driveHelper: DriveHelper
+) : ViewModel() {
+
+    private val _hasLoggedOut = MutableStateFlow(false)
+    val hasLoggedOut = _hasLoggedOut.asStateFlow()
+
+    fun logOut() = viewModelScope.launch {
+        delay(250L)
+        val client = driveHelper.getClient()
+        // client.revokeAccess()
+        client.signOut()
+        _hasLoggedOut.value = true
+    }
+
+}
diff --git a/app/src/main/java/zechs/drive/stream/ui/main/MainActivity.kt b/app/src/main/java/zechs/drive/stream/ui/main/MainActivity.kt
index f2f80fe..28a2699 100644
--- a/app/src/main/java/zechs/drive/stream/ui/main/MainActivity.kt
+++ b/app/src/main/java/zechs/drive/stream/ui/main/MainActivity.kt
@@ -12,10 +12,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions
-import com.google.android.gms.common.Scopes
-import com.google.android.gms.common.api.Scope
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import zechs.drive.stream.R
@@ -69,13 +65,7 @@ class MainActivity : AppCompatActivity() {
     private fun requestSignIn() {
         Log.d(TAG, "Requesting sign-in")
 
-        val signInOptions = GoogleSignInOptions
-            .Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-            .requestScopes(Scope(Scopes.DRIVE_FULL))
-            .requestEmail()
-            .build()
-
-        val client = GoogleSignIn.getClient(this, signInOptions)
+        val client = viewModel.getClient()
 
         val startForResult = registerForActivityResult(
             ActivityResultContracts.StartActivityForResult()
diff --git a/app/src/main/java/zechs/drive/stream/ui/main/MainViewModel.kt b/app/src/main/java/zechs/drive/stream/ui/main/MainViewModel.kt
index cabf246..09de927 100755
--- a/app/src/main/java/zechs/drive/stream/ui/main/MainViewModel.kt
+++ b/app/src/main/java/zechs/drive/stream/ui/main/MainViewModel.kt
@@ -47,4 +47,5 @@ class MainViewModel @Inject constructor(
         Log.d(TAG, msg)
     }
 
+    fun getClient() = driveHelper.getClient()
 }
diff --git a/app/src/main/java/zechs/drive/stream/ui/player/PlayerActivity.kt b/app/src/main/java/zechs/drive/stream/ui/player/PlayerActivity.kt
index 23ae971..7769a2c 100644
--- a/app/src/main/java/zechs/drive/stream/ui/player/PlayerActivity.kt
+++ b/app/src/main/java/zechs/drive/stream/ui/player/PlayerActivity.kt
@@ -7,7 +7,9 @@ import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.view.View
 import android.view.animation.AccelerateInterpolator
+import android.widget.HorizontalScrollView
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -69,6 +71,7 @@ class PlayerActivity : AppCompatActivity() {
 
     // Player views
     private lateinit var mainControlsRoot: LinearLayout
+    private lateinit var controlsScrollView: HorizontalScrollView
     private lateinit var progressViewGroup: LinearLayout
     private lateinit var toolbar: MaterialToolbar
     private lateinit var btnPlay: MaterialButton
@@ -80,6 +83,8 @@ class PlayerActivity : AppCompatActivity() {
     private lateinit var btnPip: MaterialButton
     private lateinit var btnSpeed: MaterialButton
     private lateinit var btnRotate: MaterialButton
+    private lateinit var btnLock: MaterialButton
+    private lateinit var btnUnlock: MaterialButton
 
     // Dialogs
     private var audioDialog: Dialog? = null
@@ -88,6 +93,7 @@ class PlayerActivity : AppCompatActivity() {
 
     // States
     private var onStopCalled = false
+    private var controlsLocked = false
 
     // Configs
     private var speed = arrayOf("0.25x", "0.5x", "Normal", "1.25x", "1.5x", "2x")
@@ -105,6 +111,7 @@ class PlayerActivity : AppCompatActivity() {
         playerView = binding.playerView
 
         mainControlsRoot = playerView.findViewById(R.id.mainControls)
+        controlsScrollView = playerView.findViewById(R.id.controlsScrollView)
         progressViewGroup = playerView.findViewById(R.id.linearLayout2)
         toolbar = playerView.findViewById(R.id.playerToolbar)
         btnPlay = playerView.findViewById(R.id.btnPlay)
@@ -116,6 +123,8 @@ class PlayerActivity : AppCompatActivity() {
         btnPip = playerView.findViewById(R.id.btnPip)
         btnSpeed = playerView.findViewById(R.id.btnSpeed)
         btnRotate = playerView.findViewById(R.id.btnRotate)
+        btnLock = playerView.findViewById(R.id.btnLock)
+        btnUnlock = playerView.findViewById(R.id.btnUnlock)
 
         // Back button
         toolbar.setNavigationOnClickListener {
@@ -194,6 +203,16 @@ class PlayerActivity : AppCompatActivity() {
             setOrientation(this@PlayerActivity, orientation)
         }
 
+        btnLock.setOnClickListener {
+            controlsLocked = true
+            handleLockingControls()
+        }
+
+        btnUnlock.setOnClickListener {
+            controlsLocked = false
+            handleLockingControls()
+        }
+
         updateOrientation(resources.configuration)
         initPlayer()
         playMedia()
@@ -325,6 +344,40 @@ class PlayerActivity : AppCompatActivity() {
             .setSeekForwardIncrementMs(10_000)
             .setSeekBackIncrementMs(10_000)
             .build()
+
+        playerView.setControllerVisibilityListener {
+            if (it == View.VISIBLE) {
+                handleLockingControls()
+            }
+        }
+
+    }
+
+    private fun handleLockingControls() {
+        TransitionManager.beginDelayedTransition(
+            playerView, AutoTransition().apply {
+                duration = 150L
+            }
+        )
+        if (controlsLocked) {
+            lockControls()
+        } else {
+            unlockControls()
+        }
+    }
+
+    private fun lockControls() {
+        controlsScrollView.visibility = View.GONE
+        mainControlsRoot.visibility = View.GONE
+        btnUnlock.visibility = View.VISIBLE
+        toolbar.visibility = View.GONE
+    }
+
+    private fun unlockControls() {
+        btnUnlock.visibility = View.GONE
+        toolbar.visibility = View.VISIBLE
+        controlsScrollView.visibility = View.VISIBLE
+        mainControlsRoot.visibility = View.VISIBLE
     }
 
     private fun releasePlayer() {
diff --git a/app/src/main/java/zechs/drive/stream/ui/player/utils/Orientation.kt b/app/src/main/java/zechs/drive/stream/ui/player/utils/Orientation.kt
index e542ffb..35e5f1e 100644
--- a/app/src/main/java/zechs/drive/stream/ui/player/utils/Orientation.kt
+++ b/app/src/main/java/zechs/drive/stream/ui/player/utils/Orientation.kt
@@ -12,8 +12,8 @@ enum class Orientation(
 
 fun setOrientation(activity: Activity, orientation: Orientation?) {
     activity.requestedOrientation = when (orientation) {
-        Orientation.LANDSCAPE -> SCREEN_ORIENTATION_LANDSCAPE
-        Orientation.PORTRAIT -> SCREEN_ORIENTATION_PORTRAIT
+        Orientation.LANDSCAPE -> SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+        Orientation.PORTRAIT -> SCREEN_ORIENTATION_SENSOR_PORTRAIT
         else -> SCREEN_ORIENTATION_FULL_SENSOR
     }
 }
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..d306148
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,48 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.12528"
+      android:scaleY="0.12528"
+      android:translateX="22.68"
+      android:translateY="22.68">
+    <group>
+      <clip-path
+          android:pathData="M0,0h500v500h-500z"/>
+      <path
+          android:pathData="M278.67,131.97a108.87,108.87 0,0 1,108.19 97.04l1.07,9.9a11.65,11.65 0,0 0,9.54 10.26l9.81,1.78c12.49,2.23 24.08,9.28 32.73,19.71a59.53,59.53 0,0 1,13.56 37.55A61.59,61.59 0,0 1,436.71 349.95c-10.88,11.24 -24.8,17.48 -39.33,17.48L102.88,367.43c-14.54,0 -28.45,-6.24 -39.15,-17.57a61.42,61.42 0,0 1,-16.86 -41.74,63.6 63.6,0 0,1 11.68,-36.48A57.74,57.74 0,0 1,88.6 249.26l9.19,-2.94a11.68,11.68 0,0 0,8.12 -10.88l0.18,-9.63a43.44,43.44 0,0 1,12.04 -28.9c7.4,-7.76 16.86,-11.95 26.67,-11.95a38.73,38.73 0,0 1,14.54 2.85l9.9,4.01a11.63,11.63 0,0 0,14 -4.19l6.07,-8.74a108.53,108.53 0,0 1,89.37 -46.91m0,-24.97a133.59,133.59 0,0 0,-110.06 57.71,63.22 63.22,0 0,0 -23.99,-4.73c-34.87,0 -63.15,30.68 -63.68,65.46C45.35,236.77 21.8,271.55 21.8,308.12c0,44.77 36.3,84.28 81.07,84.28L397.47,392.41c44.77,0 81.07,-39.51 81.07,-84.28 0,-39.87 -28.81,-75.01 -66.8,-81.79A133.94,133.94 0,0 0,278.67 107Z">
+        <aapt:attr name="android:fillColor">
+          <gradient 
+              android:startX="478.54"
+              android:startY="309.92"
+              android:endX="21.8"
+              android:endY="313.92"
+              android:type="linear">
+            <item android:offset="0" android:color="#FF00E6F6"/>
+            <item android:offset="0" android:color="#FF5E4FE6"/>
+            <item android:offset="0" android:color="#FF004E92"/>
+            <item android:offset="0" android:color="#FFAD09B4"/>
+            <item android:offset="0" android:color="#FFFF4081"/>
+            <item android:offset="1" android:color="#FF448AFF"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+      <path
+          android:pathData="M210.18,199.5l-0,0a14.13,14.13 75,0 1,3.57 -4.09,14.33 14.33,75 0,1 4.8,-2.46 13.97,13.97 75,0 1,11.02 1.36L283.5,225.44a100.46,100.46 75,0 1,4.98 19.73A134.14,134.14 75,0 1,289.94 268.34a128.77,128.77 75,0 1,-6.16 37.47,1.96 1.96,75 0,0 1.27,2.39 2.05,2.05 75,0 0,2.35 -0.97,2.19 2.19,75 0,0 0.13,-0.26 132.68,132.68 75,0 0,6.38 -38.71c0.31,-14.28 -1.45,-28.02 -5.1,-39.75L317.8,245.24a41.51,41.51 75,0 1,-5.56 14.94A78.13,78.13 75,0 1,304.57 271.04a2.17,2.17 75,0 0,-0.27 0.37,2.11 2.11,75 0,0 -0.2,1.68 1.89,1.89 75,0 0,1.52 1.32,2.04 2.04,75 0,0 1.91,-0.8A82.43,82.43 75,0 0,315.63 262.15,47.97 47.97,75 0,0 321.46,247.36l14.46,8.35a13.69,13.69 75,0 1,6.87 9.06,13.89 13.89,75 0,1 0.1,5.28 14.92,14.92 75,0 1,-1.8 4.97,14.23 14.23,75 0,1 -5.3,5.3l-56.1,31.62a95.83,95.83 75,0 1,-18.87 -4.76,121.47 121.47,75 0,1 -19.75,-9.19 113.82,113.82 75,0 1,-27.78 -22.14,1.88 1.88,75 0,0 -1.91,-0.64 2.12,2.12 75,0 0,-1.34 1.01,2.15 2.15,75 0,0 -0.19,0.44 2.01,2.01 75,0 0,0.46 2.01,117.62 117.62,75 0,0 28.7,22.89 117.02,117.02 75,0 0,35.02 13.58l-29.96,16.89c-5.27,-4.68 -9.78,-12.38 -13.05,-22.26a1.89,1.89 75,0 0,-1.48 -1.4,2.03 2.03,75 0,0 -1.95,0.75 2.14,2.14 75,0 0,-0.19 0.27,2.11 2.11,75 0,0 -0.14,1.82c3.25,9.83 7.76,17.75 13.05,22.92l-9.65,5.44a13.99,13.99 75,0 1,-14.02 -0.06,14.03 14.03,75 0,1 -7.09,-12.13l-0.58,-57.5a106.92,106.92 75,0 1,14.44 -15.17,137.12 137.12,75 0,1 19.02,-13.86 124.19,124.19 75,0 1,34.18 -14.59,2.1 2.1,75 0,0 1.4,-1.02 2.17,2.17 75,0 0,0.17 -0.38,2.03 2.03,75 0,0 -0.39,-2.03 1.89,1.89 75,0 0,-1.94 -0.54,128.42 128.42,75 0,0 -35.32,15.08 131.1,131.1 75,0 0,-31.62 26.36l-0.35,-34.41a33.55,33.55 75,0 1,12.7 -3.58A64.06,64.06 75,0 1,237.84 226.48a2.03,2.03 75,0 0,1.93 -0.7,2.18 2.18,75 0,0 0.23,-0.32 2.1,2.1 75,0 0,0.18 -1.73,1.88 1.88,75 0,0 -1.54,-1.27c-11.97,-1.97 -22.38,-1.14 -30.13,2.42l-0.18,-18.17A14.1,14.1 75,0 1,210.18 199.5ZM263.64,272.46a7.54,7.54 75,0 0,0.62 -1.39,7.07 7.07,75 0,0 -0.38,-5.51 6.47,6.47 75,0 0,-3.86 -3.26A7.1,7.1 75,0 0,251.89 265.66a7.53,7.53 75,0 0,-0.62 1.39A7.08,7.08 75,0 0,251.65 272.56a6.47,6.47 75,0 0,3.86 3.26A7.1,7.1 75,0 0,263.64 272.46Z">
+        <aapt:attr name="android:fillColor">
+          <gradient 
+              android:startX="275.74"
+              android:startY="192.25"
+              android:endX="275.74"
+              android:endY="341.43"
+              android:type="linear">
+            <item android:offset="0" android:color="#FFFF4081"/>
+            <item android:offset="1" android:color="#FF448AFF"/>
+          </gradient>
+        </aapt:attr>
+      </path>
+    </group>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_24.xml b/app/src/main/res/drawable/ic_lock_24.xml
new file mode 100644
index 0000000..87281bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM9,8L9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_logout_24.xml b/app/src/main/res/drawable/ic_logout_24.xml
new file mode 100644
index 0000000..7b5f586
--- /dev/null
+++ b/app/src/main/res/drawable/ic_logout_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9,42Q7.8,42 6.9,41.1Q6,40.2 6,39V9Q6,7.8 6.9,6.9Q7.8,6 9,6H23.55V9H9Q9,9 9,9Q9,9 9,9V39Q9,39 9,39Q9,39 9,39H23.55V42ZM33.3,32.75 L31.15,30.6 36.25,25.5H18.75V22.5H36.15L31.05,17.4L33.2,15.25L42,24.05Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_unlock_24.xml b/app/src/main/res/drawable/ic_unlock_24.xml
new file mode 100644
index 0000000..5d19d4f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unlock_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h2c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index a185562..7feac63 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -20,6 +20,7 @@
             style="@style/MenuTheme"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            app:menu="@menu/main_menu"
             app:title="@string/app_name" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/player_control_view.xml b/app/src/main/res/layout/player_control_view.xml
index b462d91..47a512c 100644
--- a/app/src/main/res/layout/player_control_view.xml
+++ b/app/src/main/res/layout/player_control_view.xml
@@ -26,6 +26,29 @@
         tools:subtitle="video metadata"
         tools:title="Video title" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btnUnlock"
+        style="@style/Widget.Material3.Button.TonalButton.Icon.Only"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:padding="12dp"
+        app:iconSize="20dp"
+        android:tooltipText="@string/unlock"
+        android:visibility="gone"
+        app:icon="@drawable/ic_unlock_24"
+        app:iconTint="@android:color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/playerToolbar"
+        app:layout_constraintVertical_bias="0.0"
+        tools:visibility="visible" />
+
     <LinearLayout
         android:id="@+id/mainControls"
         android:layout_width="0dp"
@@ -87,7 +110,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        app:layout_constraintBottom_toTopOf="@+id/horizontalScrollView"
+        app:layout_constraintBottom_toTopOf="@+id/controlsScrollView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -121,8 +144,8 @@
     </LinearLayout>
 
     <HorizontalScrollView
-        android:id="@+id/horizontalScrollView"
-        android:layout_width="match_parent"
+        android:id="@+id/controlsScrollView"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:scrollbars="none"
@@ -137,10 +160,19 @@
             android:id="@+id/linearLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:gravity="center"
             android:orientation="horizontal">
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnLock"
+                style="@style/Widget.Material3.Button.IconButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:tooltipText="@string/lock"
+                app:icon="@drawable/ic_lock_24"
+                app:iconTint="@android:color/white" />
+
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnRotate"
                 style="@style/Widget.Material3.Button.IconButton"
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
new file mode 100644
index 0000000..9305ad7
--- /dev/null
+++ b/app/src/main/res/menu/main_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_logOut"
+        android:icon="@drawable/ic_logout_24"
+        android:title="@string/logout"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..7353dbd 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..7353dbd 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..91bc8c6
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8c5d104
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..a56ba0e
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..f534365
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..2305f67
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..afb4450
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..0154c3b
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..5d210ce
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..004af19
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..fb7ae98
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51f0cc5..a209945 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,4 +23,10 @@
     <string name="ok">OK</string>
     <string name="details">Details</string>
     <string name="retry">Retry</string>
+    <string name="lock">Lock</string>
+    <string name="unlock">Unlock</string>
+    <string name="logout">Logout</string>
+    <string name="log_out_dialog_title">Are you sure you want to log out?</string>
+    <string name="no">No</string>
+    <string name="yes">Yes</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2ae2de4..5f37909 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -57,4 +57,8 @@
         <item name="iconTint">@color/textColor_87</item>
     </style>
 
+    <style name="Widget.Material3.Button.TonalButton.Icon.Only" parent="Widget.Material3.Button.IconButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Button.TonalButton</item>
+    </style>
+
 </resources>
\ No newline at end of file