diff --git a/res/layout/frag_imessaging.xml b/res/layout/frag_imessaging.xml
index ab75024..e7d69ba 100644
--- a/res/layout/frag_imessaging.xml
+++ b/res/layout/frag_imessaging.xml
@@ -1,33 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
     <ListView
         android:id="@+id/message_list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_above="@+id/form"
+        android:background="@color/sfl_dark_blue"
         android:layout_alignParentTop="true" >
     </ListView>
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/form"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:orientation="vertical" >
+        android:background="@color/darker_gray"
+        android:weightSum="4" >
 
         <EditText
-            android:id="@+id/editText1"
-            android:layout_width="wrap_content"
+            android:id="@+id/send_im_edittext"
+            android:layout_width="0dp"
+            android:layout_weight="3"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentRight="true"
+            android:imeOptions="actionSend"
             android:ems="10"
-            android:inputType="text" />
-    </RelativeLayout>
+            android:inputType="textCapSentences|textImeMultiLine" />
+        
+        <Button 
+            android:id="@+id/send_im_button"
+             android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="Send"
+            android:background="@drawable/item_generic_selector"/>
+    </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/item_message.xml b/res/layout/item_message.xml
index da513cc..a9042a3 100644
--- a/res/layout/item_message.xml
+++ b/res/layout/item_message.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content" >
 
     <LinearLayout
         android:id="@+id/wrapper"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
         <TextView
@@ -16,7 +16,7 @@
             android:layout_margin="5dip"
             android:background="@drawable/item_generic_selector"
             android:paddingLeft="10dip"
-            android:text="Hello bubbles!"
+            android:autoLink="all"
             android:textColor="@android:color/primary_text_light" />
     </LinearLayout>