diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4b4db3ba..853f3246 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -52,7 +52,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/aorSpinner"
-                    android:layout_marginTop="12dp"
+                    android:layout_marginTop="10dp"
                     android:orientation="horizontal" >
 
                     <TextView
@@ -79,37 +79,46 @@
 
                 </LinearLayout>
 
-                <LinearLayout
+                <RelativeLayout
                     android:id="@+id/uriRow"
-                    android:orientation="horizontal"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/callTitleRow" >
+                    android:layout_below="@id/callTitleRow"
+                    android:layout_marginTop="14dp"
+                    android:orientation="horizontal">
 
-                    <AutoCompleteTextView
-                        android:id="@+id/callUri"
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight = "1"
-                        android:inputType="textEmailAddress"
-                        android:textSize="20sp"
-                        android:hint="@string/callee"
-                        android:textColorHint="@color/colorSecondaryDark" >
-                        <!-- <requestFocus /> -->
-                    </AutoCompleteTextView>
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginEnd="32dp"
+                        app:endIconMode="clear_text">
+
+                        <com.google.android.material.textfield.MaterialAutoCompleteTextView
+                            android:id="@+id/callUri"
+                            android:layout_width="fill_parent"
+                            android:layout_height="32dp"
+                            android:completionThreshold="3"
+                            android:inputType="textEmailAddress"
+                            android:textColorHint="@color/colorSecondaryDark"
+                            android:textSize="20sp" />
+                    </com.google.android.material.textfield.TextInputLayout>
 
                     <ImageButton
                         android:id="@+id/securityButton"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:layout_weight ="0"
+                        android:layout_marginEnd="0dp"
+                        android:layout_marginTop="4dp"
+                        android:layout_alignParentEnd="true"
                         android:layout_gravity="center_vertical"
                         android:visibility="invisible"
                         android:background="#00000000"
                         android:contentDescription="@string/app_name" >
                     </ImageButton>
 
-                </LinearLayout>
+                </RelativeLayout>
 
                 <LinearLayout
                     android:id="@+id/diverter"
@@ -156,7 +165,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/diverter"
-                    android:paddingTop="10dp"
+                    android:paddingTop="12dp"
                     android:paddingBottom="10dp" >
 
                     <ImageButton