diff --git a/app/src/main/res/layout/activity_main_header.xml b/app/src/main/res/layout/activity_main_header.xml
index 9d0c35e..9776cac 100644
--- a/app/src/main/res/layout/activity_main_header.xml
+++ b/app/src/main/res/layout/activity_main_header.xml
@@ -9,12 +9,30 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin">
 
-    <EditText
-        android:id="@+id/aliasText"
+    <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/textField"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/label">
+
+    <com.google.android.material.textfield.TextInputEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:hint="@string/key_alias"/>
+    />
+
+</com.google.android.material.textfield.TextInputLayout>
+      
 
     <Button
         android:id="@+id/generateKeyPair"
@@ -26,32 +44,91 @@
         android:text="@string/generate"
         android:onClick="createNewKeys" />
 
-    <EditText
-        android:id="@+id/startText"
+    <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/textField"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/label">
+
+    <com.google.android.material.textfield.TextInputEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/generateKeyPair"
-        android:layout_centerHorizontal="true"
-        android:hint="@string/initial_text"/>
+    />
+
+</com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/textField"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/label">
 
-    <EditText
-        android:id="@+id/encryptedText"
+    <com.google.android.material.textfield.TextInputEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/startText"
-        android:layout_centerHorizontal="true"
-        android:editable="false"
-        android:textIsSelectable="true"
-        android:hint="@string/final_text"/>
+    />
+
+</com.google.android.material.textfield.TextInputLayout>
+    <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/textField"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/label">
 
-    <EditText
-        android:id="@+id/decryptedText"
+    <com.google.android.material.textfield.TextInputEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/encryptedText"
+    />
+
+</com.google.android.material.textfield.TextInputLayout>
+
+</RelativeLayout>
+
+    <Button
+        android:id="@+id/generateKeyPair"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/aliasText"
         android:layout_centerHorizontal="true"
-        android:editable="false"
-        android:textIsSelectable="true"
-        android:hint="@string/decrypt_result"/>
+        android:layout_alignParentRight="true"
+        android:text="@string/generate"
+        android:onClick="createNewKeys" />
+
+   <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/textField"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/label">
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
+</com.google.android.material.textfield.TextInputLayout>
+    <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/textField"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/label">
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
+</com.google.android.material.textfield.TextInputLayout>
+    <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/textField"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:hint="@string/label">
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
+</com.google.android.material.textfield.TextInputLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>