diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
index 5897586..f3410f6 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
@@ -112,13 +112,13 @@ public class BucketSelect extends AppCompatActivity {
         recyclerView.addOnItemTouchListener(new RecyclerTouchListener(getApplicationContext(), recyclerView, new RecyclerTouchListener.ClickListener() {
             @Override
             public void onClick(View view, int position) {
-                System.out.println("Click on "+Name.get(position).toString());
+                //System.out.println("Click on "+Name.get(position).toString());
                 explorer(Name.get(position).toString());
             }
 
             @Override
             public void onLongClick(View view, int position) {
-                System.out.println("Long click on "+Name.get(position).toString());
+                //System.out.println("Long click on "+Name.get(position).toString());
             }
         }));
     }
diff --git a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java
index 746d2c1..758d7eb 100644
--- a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java
+++ b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java
@@ -23,7 +23,7 @@ public class ImageViewer extends AppCompatActivity {
         final ProgressBar simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
         String videoURL = getIntent().getStringExtra("video_url");
         ImageView iv=(ImageView) findViewById(R.id.imageViewer);
-        System.out.println(videoURL);
+        //System.out.println(videoURL);
         Thread imgread = new Thread(new Runnable() {
 
             @Override
diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
index d00f020..50cdeff 100644
--- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java
+++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
@@ -42,7 +42,6 @@ public class MainActivity extends AppCompatActivity {
         db = dbHelper.getWritableDatabase();
         if (db != null) {
             // Database Queries
-            System.out.println("Database OK");
             Name = new ArrayList<String>();
             Img = new ArrayList<String>();
             String query = "SELECT id FROM account";
@@ -62,9 +61,6 @@ public class MainActivity extends AppCompatActivity {
             public void run() {
                 try  {
                     //Your code goes here
-
-                    System.out.println(Name);
-
                     runOnUiThread(new Runnable() {
 
                         @Override
@@ -101,10 +97,8 @@ public class MainActivity extends AppCompatActivity {
                 db = dbHelper.getWritableDatabase();
                 if (db != null) {
                     // Database Queries
-                    System.out.println("Database OK");
                     try {
                         String query = "SELECT endpoint, username, password, region FROM account where id=\""+ Name.get(position).toString()+ "\"";
-                        System.out.println(query);
                         Cursor cursor = db.rawQuery(query,null);
                         if (cursor.moveToNext()){
                             endpoint = cursor.getString(0);
diff --git a/app/src/main/res/layout/activity_account_add.xml b/app/src/main/res/layout/activity_account_add.xml
index 8373475..bd484b8 100644
--- a/app/src/main/res/layout/activity_account_add.xml
+++ b/app/src/main/res/layout/activity_account_add.xml
@@ -1,33 +1,29 @@
 <?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"
+<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=".AccountAdd">
 
     <EditText
         android:id="@+id/alias"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="0dp"
         android:focusable="true"
         android:hint="@string/accountadd_alias"
         android:importantForAutofill="no"
         android:inputType="text"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textColorHint="?attr/colorOnSecondary"
         tools:ignore="MissingConstraints" />
 
     <LinearLayout
         android:id="@+id/endpointLayout"
         android:layout_width="match_parent"
-        android:layout_height="52dp"
-        android:layout_marginTop="44dp"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:padding="10dp"
-        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="MissingConstraints"
         tools:layout_editor_absoluteX="20dp">
 
@@ -40,7 +36,7 @@
             android:hint="@string/accountadd_endpoint"
             android:importantForAutofill="no"
             android:inputType="textUri"
-            app:layout_constraintTop_toTopOf="parent"
+            android:textColorHint="?attr/colorOnSecondary"
             tools:ignore="MissingConstraints" />
 
         <EditText
@@ -51,8 +47,8 @@
             android:focusable="true"
             android:hint="@string/accountadd_region"
             android:importantForAutofill="no"
-            android:inputType="textUri"
-            app:layout_constraintTop_toTopOf="parent"
+            android:inputType="textNoSuggestions"
+            android:textColorHint="?attr/colorOnSecondary"
             tools:ignore="MissingConstraints" />
 
     </LinearLayout>
@@ -61,28 +57,22 @@
         android:id="@+id/username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="96dp"
         android:autofillHints="username"
         android:focusable="true"
         android:hint="@string/accountadd_username"
         android:inputType="textNoSuggestions"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textColorHint="?attr/colorOnSecondary"
         tools:ignore="MissingConstraints" />
 
     <EditText
         android:id="@+id/password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="142dp"
         android:autofillHints="username"
         android:focusable="true"
         android:hint="@string/accountadd_password"
         android:inputType="textPassword"
-        app:layout_constraintTop_toTopOf="parent"
+        android:textColorHint="?attr/colorOnSecondary"
         tools:ignore="MissingConstraints" />
 
     <LinearLayout
@@ -91,7 +81,6 @@
         android:layout_height="80dp"
         android:orientation="horizontal"
         android:padding="10dp"
-        app:layout_constraintTop_toBottomOf="@+id/password"
         tools:ignore="MissingConstraints"
         tools:layout_editor_absoluteX="20dp">
 
@@ -113,4 +102,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</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
index 5285ebb..4b5dce5 100644
--- a/app/src/main/res/layout/activity_image_viewer.xml
+++ b/app/src/main/res/layout/activity_image_viewer.xml
@@ -10,10 +10,11 @@
         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"
-        tools:ignore="MissingConstraints" />
+        tools:layout_editor_absoluteY="82dp" />
 
     <ProgressBar
         android:id="@+id/simpleProgressBar"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cf83c33..ee55d53 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,12 +7,6 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/accountselect"
-        android:textAlignment="center"
-        android:textSize="25sp" />
 
     <LinearLayout
         android:id="@+id/linearLayout"
@@ -43,6 +37,13 @@
 
     </LinearLayout>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/accountselect"
+        android:textAlignment="center"
+        android:textSize="25sp" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/alist"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 3494b48..0fd5fd5 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -8,7 +8,7 @@
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b16f5b..e68f78e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="account_list">Account list</string>
     <string name="bucket_list">Bucket list</string>
     <string name="object_list">Object list</string>
+    <string name="Image">Image</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="file_external">Open in</string>