diff --git a/app/src/main/java/gallery/memories/MainActivity.kt b/app/src/main/java/gallery/memories/MainActivity.kt
index 065e3d75..91e8628d 100644
--- a/app/src/main/java/gallery/memories/MainActivity.kt
+++ b/app/src/main/java/gallery/memories/MainActivity.kt
@@ -167,6 +167,8 @@ import gallery.memories.databinding.ActivityMainBinding
                 // Bind to player view
                 binding.videoView.player = exoPlayer
                 binding.videoView.visibility = View.VISIBLE
+                binding.videoView.setShowNextButton(false)
+                binding.videoView.setShowPreviousButton(false)
 
                 // Check if HLS source from URI (contains .m3u8 anywhere)
                 if (uri.toString().contains(".m3u8")) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a63f210f..7edf6d3c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@android:color/black"
+        app:show_buffering="always"
     />
 
     <WebView