diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
index 6d51858be..c50592897 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
@@ -171,6 +171,7 @@ public class PasswordStore extends Activity  implements ToCloneOrNot.OnFragmentI
                 return;
             }
             PasswordRepository.createRepository(localDir);
+            checkLocalRepository();
         }
     }
 
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
index 35404c764..774264adf 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -20,6 +20,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.GridLayout;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -98,6 +99,10 @@ public class PgpHandler extends Activity {
         if (extra.getString("Operation").equals("DECRYPT")) {
             setContentView(R.layout.decrypt_layout);
             ((TextView) findViewById(R.id.crypto_password_file)).setText(extra.getString("NAME"));
+            String cat = new File(extra.getString("FILE_PATH").replace(PasswordRepository.getWorkTree().getAbsolutePath(), ""))
+                    .getParentFile().getName();
+
+            ((TextView) findViewById(R.id.crypto_password_category)).setText(cat + "/");
         } else if (extra.getString("Operation").equals("ENCRYPT")) {
             setContentView(R.layout.encrypt_layout);
             String cat = extra.getString("FILE_PATH");
@@ -221,6 +226,7 @@ public class PgpHandler extends Activity {
         protected void onPostExecute(Boolean b) {
             //clear password
             ((TextView) findViewById(R.id.crypto_password_show)).setText("");
+            ((TextView) findViewById(R.id.crypto_extra_show)).setText("");
             findViewById(R.id.crypto_extra_show_layout).setVisibility(View.INVISIBLE);
             findViewById(R.id.crypto_container).setVisibility(View.INVISIBLE);
         }
diff --git a/app/src/main/res/drawable-xxhdpi/blue_rectangle.xml b/app/src/main/res/drawable-xxhdpi/blue_rectangle.xml
new file mode 100644
index 000000000..61cb44f5d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/blue_rectangle.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle"
+            android:dither="true">
+            <corners android:radius="2dp"/>
+            <solid android:color="#ccc" />
+
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle"   android:dither="true">
+            <corners android:radius="2dp" />
+            <solid android:color="@android:color/holo_blue_light" />
+
+            <padding android:bottom="8dp"
+                android:left="8dp"
+                android:right="8dp"
+                android:top="8dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/red_rectangle.xml b/app/src/main/res/drawable-xxhdpi/red_rectangle.xml
index b8e6a5d62..a6c48d0f2 100644
--- a/app/src/main/res/drawable-xxhdpi/red_rectangle.xml
+++ b/app/src/main/res/drawable-xxhdpi/red_rectangle.xml
@@ -10,7 +10,7 @@
         </shape>
     </item>
 
-    <item android:bottom="2dp">
+    <item>
         <shape android:shape="rectangle"   android:dither="true">
             <corners android:radius="2dp" />
             <solid android:color="@android:color/holo_red_light" />
diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index c1ae7c6cd..e81f288b0 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="com.zeapo.pwdstore.crypto.PgpHandler"
     android:orientation="vertical"
     android:background="#eee">
@@ -19,30 +15,59 @@
         <GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/rectangle"
-            android:orientation="horizontal">
+            android:background="@drawable/rectangle">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/holo_blue_light"
+                android:text="CATEGORY HERE"
+                android:id="@+id/crypto_password_category"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dp"
+                android:layout_column="0"
+                android:layout_row="0"
+                android:layout_columnSpan="2"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@android:color/holo_orange_dark"
-                android:text="Large Text"
+                android:textStyle="bold"
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+                android:text="PASSWORD FILE NAME HERE"
                 android:id="@+id/crypto_password_file"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="8dp"
                 android:layout_column="0"
-                android:layout_row="0"/>
+                android:layout_columnSpan="2"
+                android:layout_row="1"/>
+
+
+            <ImageButton
+                android:id="@+id/crypto_delete_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ico_del"
+                android:background="@drawable/red_rectangle"
+                android:layout_gravity="center_vertical"
+                android:onClick="handleClick"
+                android:layout_column="3"
+                android:layout_row="0"
+                android:layout_rowSpan="2"/>
 
             <ImageButton
                 android:id="@+id/crypto_show_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ico_key"
-                android:background="@android:drawable/screen_background_light_transparent"
+                android:background="@drawable/blue_rectangle"
                 android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dp"
                 android:onClick="handleClick"
-                android:layout_column="2"
-                android:layout_row="0"/>
+                android:layout_column="4"
+                android:layout_row="0"
+                android:layout_rowSpan="2"/>
 
         </GridLayout>
 
@@ -53,6 +78,10 @@
             android:layout_height="wrap_content"
             android:background="@drawable/rectangle"
             android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingBottom="@dimen/activity_vertical_margin"
             android:visibility="invisible">
 
             <GridLayout
@@ -102,16 +131,12 @@
                     android:textStyle="bold"
                     android:textColor="@android:color/black"
                     android:text="Extra content: "/>
-                <ScrollView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-                    <TextView
-                        android:id="@+id/crypto_extra_show"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textColor="@android:color/black"
-                        android:typeface="monospace"/>
-                </ScrollView>
+                <TextView
+                    android:id="@+id/crypto_extra_show"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@android:color/black"
+                    android:typeface="monospace"/>
 
             </LinearLayout>
         </LinearLayout>
@@ -119,15 +144,4 @@
     </LinearLayout>
 
 
-    <ImageButton
-        android:id="@+id/crypto_delete_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ico_del"
-        android:background="@drawable/oval"
-        android:layout_gravity="center_vertical"
-        android:onClick="handleClick"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"/>
-
-</RelativeLayout>
\ No newline at end of file
+</ScrollView>
\ 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 51ebc4636..9c874b12f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,5 +26,8 @@
     <string name="crypto_pass_label">Password</string>
     <string name="crypto_extra_label">Extra</string>
 
+    <!-- DECRYPT Layout -->
+    <string name="crypto_category">Category</string>
+
 
 </resources>