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 c7504e69..198a2d9d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpHandler.java
@@ -140,7 +140,7 @@ public class PgpHandler extends Activity {
             TextView extraText = (TextView) findViewById(R.id.crypto_extra_show);
 
             if (extraText.getText().length() != 0)
-                ((LinearLayout) findViewById(R.id.crypto_extra_show_layout)).setVisibility(View.VISIBLE);
+                ((LinearLayout) findViewById(R.id.crypto_extra_show_layout )).setVisibility(View.VISIBLE);
 
             this.pb = (ProgressBar) findViewById(R.id.pbLoading);
             this.pb.setVisibility(ProgressBar.VISIBLE);
diff --git a/app/src/main/res/drawable-xxhdpi/oval.xml b/app/src/main/res/drawable-xxhdpi/oval.xml
new file mode 100644
index 00000000..d2149d04
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/oval.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="oval"  android:dither="true">
+            <corners android:radius="2dp"/>
+            <solid android:color="#eee" />
+            <gradient
+                android:startColor="#aaa"
+                android:centerColor="#aaa"
+                android:endColor="@android:color/transparent"
+                android:gradientRadius="55"
+                android:type="radial"
+                />
+
+            <padding android:bottom="5dp"
+                android:left="5dp"
+                android:right="5dp"
+                android:top="5dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="oval"   android:dither="true">
+            <corners android:radius="2dp" />
+            <solid android:color="@android:color/white" />
+
+            <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/rectangle.xml b/app/src/main/res/drawable-xxhdpi/rectangle.xml
index 67e169df..1f88f6df 100644
--- a/app/src/main/res/drawable-xxhdpi/rectangle.xml
+++ b/app/src/main/res/drawable-xxhdpi/rectangle.xml
@@ -6,6 +6,7 @@
             android:dither="true">
             <corners android:radius="2dp"/>
             <solid android:color="#ccc" />
+
         </shape>
     </item>
 
diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml
index 4fe6c529..ced0ec33 100644
--- a/app/src/main/res/layout/activity_pgp_handler.xml
+++ b/app/src/main/res/layout/activity_pgp_handler.xml
@@ -23,6 +23,7 @@
             android:text="Large Text"
             android:id="@+id/crypto_password_file"
             android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"
             android:layout_column="0"/>
 
         <ImageButton
diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml
index 66c5dedb..de559be0 100644
--- a/app/src/main/res/layout/activity_pwdstore.xml
+++ b/app/src/main/res/layout/activity_pwdstore.xml
@@ -1,4 +1,4 @@
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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"
@@ -14,35 +14,19 @@
         android:id="@+id/main_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_row="0"></LinearLayout>
+        android:orientation="vertical"></LinearLayout>
 
-    <GridLayout
-        android:id="@+id/bottom_layout"
-        android:orientation="horizontal"
+
+    <ImageButton
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_row="2">
+        android:src="@android:drawable/ic_input_add"
+        android:background="@drawable/oval"
+        android:layout_gravity="center_vertical"
+        android:onClick="createPassword"
+        android:layout_column="2"
+        android:layout_alignParentBottom="true"
+        android:layout_alignRight="@+id/main_layout"
+        android:layout_alignEnd="@+id/main_layout" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@android:color/holo_orange_dark"
-            android:layout_gravity="center_vertical"
-            android:text="Large Text"
-            android:id="@+id/crypto_password_file"
-            android:background="#fff"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"/>
-
-        <ImageButton
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@android:drawable/ic_input_add"
-            android:background="@drawable/rectangle"
-            android:layout_gravity="center_vertical"
-            android:onClick="createPassword"
-            android:layout_column="2"/>
-
-    </GridLayout>
-
-</GridLayout>
+</RelativeLayout>