diff --git a/README.md b/README.md
index e6e6375..66889bd 100644
--- a/README.md
+++ b/README.md
@@ -15,15 +15,13 @@ This app is based on Asgardius S3 Manager
 
 This app is a work in progress, so it have some bugs that need to be fixed
 
-You need to setup a pdf.js server to use pdf viewer. Just download latest version from official website and upload to any web server with ssl on same root domain than S3 server (can be same subdomain or a different one). Then set url to pdfjs root folder like https://example.com/pdfjs-dist
-
 [<img src="app-store-badges/fdroid.png"
     alt="Get it on F-Droid"
-    height="80">](https://f-droid.org/packages/asgardius.page.s3manager/)
+    height="80">](https://f-droid.org/packages/asgardius.page.s3music/)
 
 [<img src="app-store-badges/play-store.png"
     alt="Get it on Google Play"
-    height="80">](https://play.google.com/store/apps/details?id=asgardius.page.s3manager)
+    height="80">](https://play.google.com/store/apps/details?id=asgardius.page.s3music)
 
 F-droid release may take a few days to get updated [More info here](https://www.f-droid.org/en/docs/FAQ_-_App_Developers/#ive-published-a-new-release-why-is-it-not-in-the-repository)
 
diff --git a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java
index e01232e..dcf9d25 100644
--- a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java
@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.database.StandaloneDatabaseProvider;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.ui.PlayerNotificationManager;
+import com.google.android.exoplayer2.ui.StyledPlayerControlView;
 import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
@@ -47,6 +48,7 @@ public class VideoPlayer extends AppCompatActivity {
 
     // creating a variable for exoplayerview.
     protected StyledPlayerView playerView;
+    protected StyledPlayerControlView controlView;
     private WifiManager.WifiLock mWifiLock;
     private PowerManager.WakeLock mWakeLock;
     private PowerManager powerManager;
@@ -170,6 +172,7 @@ public class VideoPlayer extends AppCompatActivity {
         standaloneDatabaseProvider = new StandaloneDatabaseProvider(this);
         maxCacheSize = (long)videocache * 1024 * 1024;
         playerView = findViewById(R.id.player_view);
+        controlView = findViewById(R.id.control_view);
         // creating a variable for exoplayer
         player = new ExoPlayer.Builder(this).setLoadControl(loadControl).build();
         player.setAudioAttributes(audioAttributes, true);
@@ -181,6 +184,7 @@ public class VideoPlayer extends AppCompatActivity {
                 evictor,
                 standaloneDatabaseProvider);
         playerView.setPlayer(player);
+        controlView.setPlayer(player);
         playerView.setUseController(false);
         //MediaItem mediaItem = MediaItem.fromUri(videoURL);
 
@@ -250,8 +254,10 @@ public class VideoPlayer extends AppCompatActivity {
             public void onIsPlayingChanged(boolean isPlaying) {
                 if(player.isPlaying()) {
                     playpause.setImageDrawable(pause);
+                    playpause.setContentDescription(getResources().getString(R.string.pause));
                 } else {
                     playpause.setImageDrawable(play);
+                    playpause.setContentDescription(getResources().getString(R.string.play));
                 }
                 Player.Listener.super.onIsPlayingChanged(isPlaying);
             }
diff --git a/app/src/main/res/layout/activity_bucket_policy.xml b/app/src/main/res/layout/activity_bucket_policy.xml
deleted file mode 100644
index 5912f8c..0000000
--- a/app/src/main/res/layout/activity_bucket_policy.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".BucketPolicy">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:ignore="MissingConstraints">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/permission"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
-
-            <Button
-                android:id="@+id/set_public"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/set_public"
-                android:visibility="gone" />
-
-            <Button
-                android:id="@+id/set_private"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/set_private"
-                android:visibility="gone" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:max="100"
-        android:progress="50"
-        android:padding="20dp"
-        tools:ignore="MissingConstraints"
-        android:indeterminate="true" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_cors_config.xml b/app/src/main/res/layout/activity_cors_config.xml
deleted file mode 100644
index a5b6c51..0000000
--- a/app/src/main/res/layout/activity_cors_config.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".CorsConfig">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:ignore="MissingConstraints">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/origins"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
-
-            <Button
-                android:id="@+id/allow_all"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/allow_all"
-                android:visibility="gone" />
-
-            <Button
-                android:id="@+id/allow_pdf"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/allow_pdf"
-                android:visibility="gone" />
-
-            <Button
-                android:id="@+id/delete_cors"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/delete_cors"
-                android:visibility="gone" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:max="100"
-        android:progress="50"
-        android:padding="20dp"
-        tools:ignore="MissingConstraints"
-        android:indeterminate="true" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_bucket.xml b/app/src/main/res/layout/activity_create_bucket.xml
deleted file mode 100644
index 701c67f..0000000
--- a/app/src/main/res/layout/activity_create_bucket.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".CreateBucket">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/set_bucket_name"
-                android:textAlignment="center"
-                android:textSize="30sp" />
-
-            <EditText
-                android:id="@+id/bname"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:focusable="true"
-                android:hint="@string/bucket_name"
-                android:importantForAutofill="no"
-                android:inputType="text"
-                android:textColorHint="?attr/colorOnSecondary"
-                tools:ignore="MissingConstraints" />
-
-            <LinearLayout
-                android:id="@+id/linearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:orientation="horizontal"
-                android:padding="10dp"
-                tools:ignore="MissingConstraints"
-                tools:layout_editor_absoluteX="20dp">
-
-                <Button
-                    android:id="@+id/cbucket"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:text="@string/create_bucket"
-                    tools:ignore="MissingConstraints" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:indeterminate="true"
-        android:max="100"
-        android:padding="20dp"
-        android:progress="50"
-        android:visibility="invisible"
-        tools:ignore="MissingConstraints" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_downloader.xml b/app/src/main/res/layout/activity_downloader.xml
deleted file mode 100644
index 000f473..0000000
--- a/app/src/main/res/layout/activity_downloader.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".Downloader">
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:orientation="horizontal"
-        android:padding="10dp"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="20dp">
-
-        <Button
-            android:id="@+id/filedownload"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="@string/download_file"
-            tools:ignore="MissingConstraints" />
-
-    </LinearLayout>
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:indeterminate="false"
-        android:max="100"
-        android:padding="20dp"
-        android:progress="0"
-        android:visibility="invisible"
-        tools:ignore="MissingConstraints" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml
deleted file mode 100644
index 1ebad8f..0000000
--- a/app/src/main/res/layout/activity_image_viewer.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    tools:context=".ImageViewer">
-
-    <com.otaliastudios.zoom.ZoomImageView
-        android:id="@+id/imageViewer"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:contentDescription="@string/Image"
-        app:srcCompat="@drawable/empty"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="82dp"
-        app:minZoom="1.0"
-        app:maxZoom="25.5" />
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:max="100"
-        android:progress="50"
-        android:padding="20dp"
-        tools:ignore="MissingConstraints"
-        android:indeterminate="true" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_info.xml b/app/src/main/res/layout/activity_object_info.xml
deleted file mode 100644
index f38821d..0000000
--- a/app/src/main/res/layout/activity_object_info.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".ObjectInfo">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        tools:ignore="MissingConstraints">
-
-    <TextView
-        android:id="@+id/size_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="25sp" />
-
-    <TextView
-        android:id="@+id/size"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="25sp" />
-
-    <TextView
-        android:id="@+id/object_count"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="25sp" />
-
-    </LinearLayout>
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:max="100"
-        android:progress="50"
-        android:padding="20dp"
-        tools:ignore="MissingConstraints"
-        android:indeterminate="true" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_policy.xml b/app/src/main/res/layout/activity_object_policy.xml
deleted file mode 100644
index 2325102..0000000
--- a/app/src/main/res/layout/activity_object_policy.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ObjectPolicy">
-
-  <androidx.core.widget.NestedScrollView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      tools:ignore="MissingConstraints">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-      <TextView
-          android:id="@+id/permission"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:textAlignment="center"
-          android:textSize="25sp"/>
-
-      <Button
-          android:id="@+id/set_public"
-          android:layout_width="match_parent"
-          android:layout_height="70dp"
-          android:text="@string/set_public"
-          android:visibility="gone" />
-
-      <Button
-          android:id="@+id/set_private"
-          android:layout_width="match_parent"
-          android:layout_height="70dp"
-          android:text="@string/set_private"
-          android:visibility="gone" />
-
-    </LinearLayout>
-  </androidx.core.widget.NestedScrollView>
-
-  <ProgressBar
-      android:id="@+id/simpleProgressBar"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:max="100"
-      android:progress="50"
-      android:padding="20dp"
-      tools:ignore="MissingConstraints"
-      android:indeterminate="true" />
-
-  </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
deleted file mode 100644
index f638260..0000000
--- a/app/src/main/res/layout/activity_share.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".Share">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:ignore="MissingConstraints">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/expirationtext"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textSize="25sp" />
-
-            <LinearLayout
-                android:id="@+id/linearLayoutDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="10dp"
-                tools:ignore="MissingConstraints"
-                tools:layout_editor_absoluteX="20dp">
-
-                <EditText
-                    android:id="@+id/Date"
-                    android:layout_width="0dp"
-                    android:layout_height="48dp"
-                    android:layout_weight="1"
-                    android:focusable="true"
-                    android:enabled="false"
-                    android:hint="@string/share_date"
-                    android:maxLength="1"
-                    android:inputType="date"
-                    android:textColorHint="?attr/colorOnSecondary"
-                    tools:ignore="MissingConstraints" />
-
-                <EditText
-                    android:id="@+id/Hour"
-                    android:layout_width="0dp"
-                    android:layout_height="48dp"
-                    android:layout_weight="1"
-                    android:focusable="true"
-                    android:enabled="false"
-                    android:hint="@string/share_hour"
-                    android:maxLength="2"
-                    android:inputType="date"
-                    android:textColorHint="?attr/colorOnSecondary"
-                    tools:ignore="MissingConstraints" />
-
-                <EditText
-                    android:id="@+id/Minute"
-                    android:layout_width="0dp"
-                    android:layout_height="48dp"
-                    android:layout_weight="1"
-                    android:focusable="true"
-                    android:enabled="false"
-                    android:hint="@string/share_minute"
-                    android:maxLength="2"
-                    android:inputType="date"
-                    android:textColorHint="?attr/colorOnSecondary"
-                    tools:ignore="MissingConstraints" />
-
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/share"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/file_share"
-                android:visibility="gone"
-                tools:ignore="MissingConstraints" />
-
-            <Button
-                android:id="@+id/copy_links"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/copy_links"
-                android:visibility="gone"
-                tools:ignore="MissingConstraints" />
-
-            <Button
-                android:id="@+id/save_links"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/save_links"
-                android:visibility="gone"
-                tools:ignore="MissingConstraints" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:max="100"
-        android:progress="50"
-        android:padding="20dp"
-        tools:ignore="MissingConstraints"
-        android:indeterminate="true" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_text_viewer.xml b/app/src/main/res/layout/activity_text_viewer.xml
deleted file mode 100644
index 64d4b63..0000000
--- a/app/src/main/res/layout/activity_text_viewer.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".TextViewer">
-
-    <EditText
-        android:id="@+id/textShow"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:ems="10"
-        android:focusable="false"
-        android:gravity="start|top"
-        android:inputType="textMultiLine"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="79dp"
-        tools:layout_editor_absoluteY="25dp" />
-
-    <ProgressBar
-        android:id="@+id/simpleProgressBar"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:max="100"
-        android:progress="50"
-        android:padding="20dp"
-        tools:ignore="MissingConstraints"
-        android:indeterminate="true" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_uploader.xml b/app/src/main/res/layout/activity_uploader.xml
deleted file mode 100644
index 41f1c65..0000000
--- a/app/src/main/res/layout/activity_uploader.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".Uploader">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/fprefixlabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/upload_key"
-                android:textAlignment="center"
-                android:textSize="30sp" />
-
-            <EditText
-                android:id="@+id/fprefix"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:focusable="true"
-                android:hint="@string/upload_key"
-                android:importantForAutofill="no"
-                android:inputType="text"
-                android:textColorHint="?attr/colorOnSecondary"
-                tools:ignore="MissingConstraints" />
-
-            <LinearLayout
-                android:id="@+id/linearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:orientation="horizontal"
-                android:padding="10dp"
-                tools:ignore="MissingConstraints"
-                tools:layout_editor_absoluteX="20dp">
-
-                <Button
-                    android:id="@+id/fileupload"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:text="@string/upload_button"
-                    tools:ignore="MissingConstraints" />
-
-            </LinearLayout>
-
-            <ProgressBar
-                android:id="@+id/simpleProgressBar"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:indeterminate="false"
-                android:max="100"
-                android:padding="20dp"
-                android:progress="0"
-                android:visibility="invisible"
-                tools:ignore="MissingConstraints" />
-
-</LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_video_player.xml b/app/src/main/res/layout/activity_video_player.xml
index aac575c..266d9fa 100644
--- a/app/src/main/res/layout/activity_video_player.xml
+++ b/app/src/main/res/layout/activity_video_player.xml
@@ -24,11 +24,20 @@
         android:layout_width="match_parent"
         android:layout_height="200dp"
         android:orientation="vertical"
-        android:layout_weight="2" >
+        android:layout_weight="0" >
+
+        <com.google.android.exoplayer2.ui.StyledPlayerControlView
+            android:id="@+id/control_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="20dp"
+            app:bar_height="30dp"
+            app:show_timeout="0"
+            app:controller_layout_id="@layout/player_custom_controls" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="100dp"
             android:orientation="horizontal"
             android:gravity="center">
 
@@ -39,7 +48,8 @@
                 android:background="#000000"
                 android:scaleType="centerCrop"
                 android:layout_marginHorizontal="20dp"
-                app:srcCompat="@drawable/previous" />
+                app:srcCompat="@drawable/previous"
+                android:contentDescription="@string/previous" />
 
             <ImageView
                 android:id="@+id/play"
@@ -48,7 +58,8 @@
                 android:background="#000000"
                 android:scaleType="centerCrop"
                 android:layout_marginHorizontal="20dp"
-                app:srcCompat="@drawable/play" />
+                app:srcCompat="@drawable/play"
+                android:contentDescription="@string/play" />
 
             <ImageView
                 android:id="@+id/next"
@@ -57,7 +68,8 @@
                 android:background="#000000"
                 android:scaleType="centerCrop"
                 android:layout_marginHorizontal="20dp"
-                app:srcCompat="@drawable/next" />
+                app:srcCompat="@drawable/next"
+                android:contentDescription="@string/next" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/player_custom_controls.xml b/app/src/main/res/layout/player_custom_controls.xml
new file mode 100644
index 0000000..1b37bba
--- /dev/null
+++ b/app/src/main/res/layout/player_custom_controls.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:layoutDirection="ltr"
+    android:background="#CC000000"
+    android:orientation="vertical"
+    tools:targetApi="28">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView android:id="@id/exo_position"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
+            android:includeFontPadding="false"
+            android:textColor="#FFBEBEBE"/>
+
+        <View android:id="@id/exo_progress_placeholder"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="26dp"/>
+
+        <TextView android:id="@id/exo_duration"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
+            android:includeFontPadding="false"
+            android:textColor="#FFBEBEBE"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/bucket_menu.xml b/app/src/main/res/menu/bucket_menu.xml
deleted file mode 100644
index 5ff27bf..0000000
--- a/app/src/main/res/menu/bucket_menu.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/upload_file"
-        android:title="@string/upload_file_tobucket" />
-
-    <item
-        android:id="@+id/upload_folder"
-        android:title="@string/upload_folder_tobucket" />
-
-    <item
-        android:id="@+id/download_bucket"
-        android:title="@string/download_bucket" />
-
-    <item
-        android:id="@+id/sharefile"
-        android:title="@string/create_link" />
-
-    <item
-        android:id="@+id/newbucket"
-        android:title="@string/create_bucket" />
-
-    <item
-        android:id="@+id/info"
-        android:title="@string/object_info" />
-
-    <item
-        android:id="@+id/copy_name"
-        android:title="@string/copy_name" />
-
-    <item
-        android:id="@+id/cors_config"
-        android:title="@string/cors_config" />
-
-    <item
-        android:id="@+id/acl_config"
-        android:title="@string/bucket_policy" />
-
-    <item
-        android:id="@+id/deletefolder"
-        android:title="@string/file_del" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/folder_menu.xml b/app/src/main/res/menu/folder_menu.xml
deleted file mode 100644
index caaf8b8..0000000
--- a/app/src/main/res/menu/folder_menu.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/upload_file"
-        android:title="@string/upload_file_here" />
-
-    <item
-        android:id="@+id/upload_folder"
-        android:title="@string/upload_folder_here" />
-
-    <item
-        android:id="@+id/download_folder"
-        android:title="@string/download_folder" />
-
-    <item
-        android:id="@+id/sharefile"
-        android:title="@string/create_link" />
-
-    <item
-        android:id="@+id/info"
-        android:title="@string/object_info" />
-
-    <item
-        android:id="@+id/copy_name"
-        android:title="@string/copy_name" />
-
-    <item
-        android:id="@+id/acl_config"
-        android:title="@string/bucket_policy" />
-
-    <item
-        android:id="@+id/deletefolder"
-        android:title="@string/file_del" />
-
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/object_menu.xml b/app/src/main/res/menu/object_menu.xml
deleted file mode 100644
index fc1082f..0000000
--- a/app/src/main/res/menu/object_menu.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/upload_file"
-        android:title="@string/upload_file_here" />
-
-    <item
-        android:id="@+id/upload_folder"
-        android:title="@string/upload_folder_here" />
-
-    <item
-        android:id="@+id/download_file"
-        android:title="@string/download_file" />
-
-    <item
-        android:id="@+id/sharefile"
-        android:title="@string/create_link" />
-
-    <item
-        android:id="@+id/info"
-        android:title="@string/object_info" />
-
-    <item
-        android:id="@+id/copy_name"
-        android:title="@string/copy_name" />
-
-    <item
-        android:id="@+id/acl_config"
-        android:title="@string/bucket_policy" />
-
-    <item
-        android:id="@+id/deletefile"
-        android:title="@string/file_del" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 778359f..1463075 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -6,16 +6,6 @@
     <string name="Image">Imagen</string>
     <string name="broken_database">La base de datos está corrupta, favor de reinstalar la app</string>
     <string name="pending_feature">Esta característica aún no es implementada</string>
-    <string name="set_bucket_name">Establezca el nombre del nuevo bucket</string>
-    <string name="bucket_name">Nombre del bucket</string>
-    <string name="bucket_name_empty">Se requiere un nombre para el bucket</string>
-    <string name="file_share">Compartir archivo</string>
-    <string name="download_file">Descargar archivo</string>
-    <string name="download_files">Descargar archivos</string>
-    <string name="cancel_download">Cancelar descarga</string>
-    <string name="download_success">Archivo descargado exitosamente</string>
-    <string name="upload_file_tobucket">Subir archivo en este bucket</string>
-    <string name="upload_folder_tobucket">Subir carpeta en este bucket</string>
     <string name="feature_not_supported">Su dispositivo no es compatible con esta característica</string>
     <string name="file_path_fail">No se encuentra el uri del archivo</string>
     <string name="upload_button">Subir archivo</string>
@@ -31,6 +21,7 @@
     <string name="upload_failed">Subida fallida</string>
     <string name="success">Éxito</string>
     <string name="create_bucket">Crear nuevo bucket</string>
+    <string name="invalid_expiration_date">La fecha de caducidad debe ser inferior a 7 días</string>
     <string name="create_bucket_success">Bucket creado exitosamente</string>
     <string name="upload_file_here">Subir archivo en el directorio actual</string>
     <string name="upload_folder_here">Subir carpeta en el directorio actual</string>
@@ -66,20 +57,11 @@
     <string name="about_button">Acerca de esta app</string>
     <string name="accountadd_pdfendpoint">servidor pdfjs</string>
     <string name="pdf_reader_notready">Necesita configurar un servidor pdf.js</string>
-    <string name="share_date">D</string>
-    <string name="share_hour">HH</string>
-    <string name="share_minute">MM</string>
-    <string name="expiration_date">Fecha de expiración</string>
-    <string name="expiration_time">Expira dentro de</string>
-    <string name="create_link">Crear enlace</string>
-    <string name="invalid_expiration_date">La fecha de caducidad debe ser inferior a 7 días</string>
     <string name="file_size">Tamaño del archivo</string>
     <string name="object_info">Propiedades</string>
-    <string name="file_external">Abir en</string>
     <string name="folder_size">Tamaño de la carpeta</string>
     <string name="bucket_size">Tamaño del bucket</string>
     <string name="file_count">Archivos</string>
-    <string name="null_expiration_date">Debe establecer una fecha de expiración para compartir archivos</string>
     <string name="download_canceled">Descarga cancelada</string>
     <string name="upload_canceled">Subida cancelada</string>
     <string name="settings">Ajustes</string>
@@ -94,37 +76,10 @@
     <string name="playback_channel_name">Reproduccion de video</string>
     <string name="not_zero">este valor no puede ser cero</string>
     <string name="path_style">Acceso de estilo de ruta</string>
-    <string name="cors_config">Política CORS</string>
-    <string name="cors_status">Orígenes permitidos</string>
-    <string name="cors_all">Permitidos todos los orígenes</string>
-    <string name="cors_pdf">Uso de endpoint PDF permitido</string>
-    <string name="cors_npdf">Uso de endpoint PDF no permitido</string>
-    <string name="cors_none">Política CORS no encontrada</string>
-    <string name="allow_all">Permitir todo</string>
-    <string name="allow_pdf">Permitir pdf</string>
-    <string name="delete_cors">Eliminar CORS</string>
-    <string name="policy_error">No se pudo cambiar la política</string>
-    <string name="policy_ok">Política cambiada exitosamente</string>
-    <string name="download_bucket">Descargar contenido del bucket</string>
-    <string name="download_folder">Descargar contenido de la carpeta</string>
-    <string name="batch_download_success">Archivos descargados exitosamente</string>
-    <string name="copy_name">Copiar nombre al portapapeles</string>
-    <string name="copy_ok">Copiado al portapapeles</string>
-    <string name="upload_calculate">Calculando tamaño de la carpeta</string>
-    <string name="picture_too_big">Imagen demasiado grande</string>
-    <string name="save_links">Guardar enlaces en archivo</string>
-    <string name="copy_links">Copiar enlaces al potapapeles</string>
-    <string name="save_ok">Archivo guardado exitosamente</string>
-    <string name="bucket_policy">Permisos de acceso</string>
-    <string name="public_bucket">Bucket público</string>
-    <string name="private_bucket">Bucket privado</string>
-    <string name="public_object">Objeto público</string>
-    <string name="private_object">Objeto privado</string>
-    <string name="custom_policy">Política personalizada</string>
-    <string name="set_public">Establecer como público</string>
-    <string name="set_private">Establecer como privado</string>
-    <string name="parent_policy">Política establecida por carpeta padre</string>
-    <string name="expiration_not_required">Fecha de expiración no requerida</string>
     <string name="clearcache">Limpiar Cache de Video</string>
     <string name="clearcache_ok">Cache limpiada exitosamente</string>
+    <string name="play">Reproducir</string>
+    <string name="pause">Pausa</string>
+    <string name="previous">Anterior</string>
+    <string name="next">Siguiente</string>
 </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 4c451a3..df8bfc9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,30 +7,9 @@
     <string name="bucket_list">Bucket list</string>
     <string name="object_list">Object list</string>
     <string name="Image">Image</string>
-    <string name="expiration_date">Expiration date</string>
-    <string name="expiration_time">Expires within</string>
-    <string name="share_hour">HH</string>
-    <string name="share_minute">MM</string>
-    <string name="share_date">D</string>
-    <string name="create_link">Create link</string>
     <string name="invalid_expiration_date">Expiration date must be at most 7 days</string>
-    <string name="null_expiration_date">You must set an expiration date to share files</string>
     <string name="broken_database">Local database is corrupted. Please reinstall this app</string>
     <string name="pending_feature">This feature is not implemented yet</string>
-    <string name="set_bucket_name">Set new bucket name</string>
-    <string name="bucket_name">Bucket name</string>
-    <string name="bucket_name_empty">A bucket name is required</string>
-    <string name="file_share">Share file</string>
-    <string name="file_external">Open in</string>
-    <string name="download_file">Download file</string>
-    <string name="download_files">Download files</string>
-    <string name="download_bucket">Download bucket content</string>
-    <string name="download_folder">Download folder content</string>
-    <string name="cancel_download">Cancel download</string>
-    <string name="download_success">File downloaded successfully</string>
-    <string name="batch_download_success">Files downloaded successfully</string>
-    <string name="upload_file_tobucket">Upload file to this bucket</string>
-    <string name="upload_folder_tobucket">Upload folder to this bucket</string>
     <string name="feature_not_supported">Your device is not compatible with this feature</string>
     <string name="file_path_fail">File uri not found</string>
     <string name="upload_button">Upload file</string>
@@ -99,34 +78,10 @@
     <string name="playback_channel_name">Video Playback</string>
     <string name="not_zero">This value cannot be zero</string>
     <string name="path_style">Path style access</string>
-    <string name="cors_config">CORS policy</string>
-    <string name="cors_status">Allowed origins</string>
-    <string name="cors_all">All origins allowed</string>
-    <string name="cors_pdf">PDF Endpoint allowed</string>
-    <string name="cors_npdf">PDF Endpoint not allowed</string>
-    <string name="cors_none">CORS policy not found</string>
-    <string name="allow_all">Allow all</string>
-    <string name="allow_pdf">Allow pdf</string>
-    <string name="delete_cors">Delete CORS</string>
-    <string name="policy_error">Cannot change policy</string>
-    <string name="policy_ok">Policy changed successfully</string>
-    <string name="copy_name">Copy name to clipboard</string>
-    <string name="copy_ok">Copied to clipboard</string>
-    <string name="upload_calculate">Calculating folder size</string>
-    <string name="picture_too_big">Picture too big</string>
-    <string name="save_links">Save links to file</string>
-    <string name="save_ok">File saved successfully</string>
-    <string name="copy_links">Copy links to clipboard</string>
-    <string name="bucket_policy">Access permissions</string>
-    <string name="public_bucket">Public bucket</string>
-    <string name="private_bucket">Private bucket</string>
-    <string name="public_object">Public object</string>
-    <string name="private_object">Private object</string>
-    <string name="custom_policy">Custom policy</string>
-    <string name="set_public">Set as public</string>
-    <string name="set_private">Set as private</string>
-    <string name="parent_policy">Policy set by parent folder</string>
-    <string name="expiration_not_required">Expiration date not required</string>
     <string name="clearcache">Clear Video Cache</string>
     <string name="clearcache_ok">Cache clean successfully</string>
+    <string name="play">Play</string>
+    <string name="pause">Pause</string>
+    <string name="previous">Previous</string>
+    <string name="next">Next</string>
 </resources>
\ No newline at end of file