diff --git a/app/src/main/res/drawable/picture_background.xml b/app/src/main/res/drawable/picture_background.xml
new file mode 100644
index 0000000..18b450f
--- /dev/null
+++ b/app/src/main/res/drawable/picture_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/uva_color" />
+    <corners
+        android:radius="16dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_view_contact.xml b/app/src/main/res/layout/fragment_view_contact.xml
index c6da1e7..476f2ee 100644
--- a/app/src/main/res/layout/fragment_view_contact.xml
+++ b/app/src/main/res/layout/fragment_view_contact.xml
@@ -1,86 +1,101 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@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:paddingTop="@dimen/activity_vertical_margin">
 
-    <ImageView
-        android:id="@+id/contact_picture"
-        android:layout_width="54dp"
-        android:layout_height="54dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/ic_contact_picture" />
-
-    <TextView
-        android:id="@+id/contact_name"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/contact_picture"
-        android:layout_toRightOf="@+id/contact_picture"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="5dp"
-        android:ems="10"
-        android:textSize="20dp"
-        android:text="@string/public_name" />
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/contact_picture"
-        android:layout_marginTop="5dp"
-        android:ems="10"
-        android:text="@string/description" />
+        <RelativeLayout
+            android:id="@+id/picture_layout"
+            android:layout_width="96dp"
+            android:layout_height="96dp"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/picture_background">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Address information"
-        android:id="@+id/title_key_info"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/text"
-        android:layout_marginTop="5dp" />
+            <ImageView
+                android:id="@+id/contact_picture"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_contact_picture" />
+        </RelativeLayout>
 
-    <TextView
-        android:id="@+id/crypto_impl"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/title_key_info"
-        android:layout_marginTop="5dp"
-        android:text="Crypto implementation" />
+        <TextView
+            android:id="@+id/contact_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/picture_layout"
+            android:layout_marginTop="8dp"
+            android:ems="10"
+            android:gravity="center_horizontal"
+            android:text="@string/public_name"
+            android:textSize="20dp" />
 
-    <TextView
-        android:id="@+id/destination"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/crypto_impl"
-        android:layout_marginTop="5dp"
-        android:text="Destination" />
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/contact_name"
+            android:layout_marginTop="5dp"
+            android:ems="10"
+            android:gravity="center_horizontal"
+            android:text="@string/description" />
 
-    <TextView
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Fingerprint"
-        android:id="@+id/title_fingerprint"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/destination"
-        android:layout_marginTop="5dp" />
+        <TextView
+            android:id="@+id/title_key_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/text"
+            android:layout_marginTop="5dp"
+            android:text="Address information"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        android:visibility="gone"
-        android:id="@+id/fingerprint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/title_fingerprint"
-        android:layout_marginTop="5dp"
-        android:text="Fingerprint" />
+        <TextView
+            android:id="@+id/crypto_impl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/title_key_info"
+            android:layout_marginTop="5dp"
+            android:text="Crypto implementation" />
 
-</RelativeLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/destination"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/crypto_impl"
+            android:layout_marginTop="5dp"
+            android:text="Destination" />
+
+        <TextView
+            android:id="@+id/title_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/destination"
+            android:layout_marginTop="5dp"
+            android:text="Fingerprint"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/title_fingerprint"
+            android:layout_marginTop="5dp"
+            android:text="Fingerprint"
+            android:visibility="gone" />
+
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_view_identity.xml b/app/src/main/res/layout/fragment_view_identity.xml
index 0e9352c..68cf707 100644
--- a/app/src/main/res/layout/fragment_view_identity.xml
+++ b/app/src/main/res/layout/fragment_view_identity.xml
@@ -1,96 +1,111 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@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:paddingTop="@dimen/activity_vertical_margin">
 
-    <ImageView
-        android:id="@+id/identity_picture"
-        android:layout_width="54dp"
-        android:layout_height="54dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/ic_contact_picture" />
-
-    <TextView
-        android:id="@+id/public_name"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/identity_picture"
-        android:layout_toRightOf="@+id/identity_picture"
-        android:layout_marginTop="15dp"
-        android:layout_marginLeft="5dp"
-        android:ems="10"
-        android:textSize="20dp"
-        android:text="@string/public_name" />
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/identity_picture"
-        android:layout_marginTop="5dp"
-        android:ems="10"
-        android:text="@string/description" />
+        <RelativeLayout
+            android:id="@+id/picture_layout"
+            android:layout_width="96dp"
+            android:layout_height="96dp"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/picture_background">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Key information"
-        android:id="@+id/title_key_info"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/description"
-        android:layout_marginTop="5dp" />
+            <ImageView
+                android:id="@+id/identity_picture"
+                android:layout_width="64dp"
+                android:layout_height="64dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_contact_picture" />
+        </RelativeLayout>
 
-    <TextView
-        android:id="@+id/crypto_impl"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/title_key_info"
-        android:layout_marginTop="5dp"
-        android:text="Crypto implementation" />
+        <TextView
+            android:id="@+id/public_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/picture_layout"
+            android:layout_marginTop="8dp"
+            android:ems="10"
+            android:gravity="center_horizontal"
+            android:text="@string/public_name"
+            android:textSize="20dp" />
 
-    <TextView
-        android:id="@+id/key"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/crypto_impl"
-        android:layout_marginTop="5dp"
-        android:text="Key" />
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/public_name"
+            android:layout_marginTop="5dp"
+            android:ems="10"
+            android:gravity="center_horizontal"
+            android:text="@string/description" />
 
-    <TextView
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Fingerprint"
-        android:id="@+id/title_fingerprint"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/key"
-        android:layout_marginTop="5dp" />
+        <TextView
+            android:id="@+id/title_key_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/description"
+            android:layout_marginTop="5dp"
+            android:text="Key information"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        android:visibility="gone"
-        android:id="@+id/fingerprint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/title_fingerprint"
-        android:layout_marginTop="5dp"
-        android:text="Fingerprint" />
+        <TextView
+            android:id="@+id/crypto_impl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/title_key_info"
+            android:layout_marginTop="5dp"
+            android:text="Crypto implementation" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Generate QR code"
-        android:id="@+id/generate_qr"
-        android:layout_below="@+id/fingerprint"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginTop="5dp" />
+        <TextView
+            android:id="@+id/key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/crypto_impl"
+            android:layout_marginTop="5dp"
+            android:text="Key" />
 
-</RelativeLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/title_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@id/key"
+            android:layout_marginTop="5dp"
+            android:text="Fingerprint"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/title_fingerprint"
+            android:layout_marginTop="5dp"
+            android:text="Fingerprint"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/generate_qr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_below="@+id/fingerprint"
+            android:layout_marginTop="5dp"
+            android:text="Generate QR code" />
+    </RelativeLayout>
+
+</ScrollView>
\ No newline at end of file