diff --git a/bg_button-web.png b/bg_button-web.png
index 1380d0b..9cb7d75 100644
Binary files a/bg_button-web.png and b/bg_button-web.png differ
diff --git a/res/drawable-hdpi/bg_button.png b/res/drawable-hdpi/bg_button.png
index 0dc34e8..1f99356 100644
Binary files a/res/drawable-hdpi/bg_button.png and b/res/drawable-hdpi/bg_button.png differ
diff --git a/res/drawable-mdpi/bg_button.png b/res/drawable-mdpi/bg_button.png
index d389eb2..64f1154 100644
Binary files a/res/drawable-mdpi/bg_button.png and b/res/drawable-mdpi/bg_button.png differ
diff --git a/res/drawable-xhdpi/bg_button.png b/res/drawable-xhdpi/bg_button.png
index bfcb6b7..f7b847c 100644
Binary files a/res/drawable-xhdpi/bg_button.png and b/res/drawable-xhdpi/bg_button.png differ
diff --git a/res/drawable-xxhdpi/bg_button.png b/res/drawable-xxhdpi/bg_button.png
index d50728e..325e28a 100644
Binary files a/res/drawable-xxhdpi/bg_button.png and b/res/drawable-xxhdpi/bg_button.png differ
diff --git a/res/layout/login.xml b/res/layout/login.xml
index edadaa5..3ddd4f4 100644
--- a/res/layout/login.xml
+++ b/res/layout/login.xml
@@ -34,7 +34,7 @@
           android:layout_above="@+id/button3"
           android:layout_alignParentLeft="true"
           android:layout_marginBottom="84dp"
-          android:background="@drawable/bg_button"
+          android:background="@color/green"
           android:text="Login" />
 
       <Button
diff --git a/res/layout/login_form.xml b/res/layout/login_form.xml
index ceff2d5..e1eba68 100644
--- a/res/layout/login_form.xml
+++ b/res/layout/login_form.xml
@@ -1,26 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    
- <Button
-          android:id="@+id/button_login2"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_alignParentBottom="true"
-          android:layout_alignParentLeft="true"
-          android:layout_alignParentRight="true"
-          android:layout_marginBottom="36dp"
-          android:background="@color/green"
-          android:text="Login" />
- 
- 
- <TextView 
-     android:id="@+id/text_login"
-     android:layout_width="wrap content"
+    android:layout_height="match_parent"
+    android:background="#00ffee" >
+
+ <EditText
+     android:id="@+id/editText1"
+     android:layout_width="wrap_content"
      android:layout_height="wrap_content"
-     android:
+     android:layout_alignParentRight="true"
+     android:layout_alignParentTop="true"
+     android:layout_marginRight="14dp"
+     android:layout_marginTop="95dp"
+     android:ems="10"
+     android:background="#eeeeee">
      
+     <requestFocus />
+  </EditText>
+
+ <EditText
+     android:id="@+id/editText2"
+     android:layout_width="wrap_content"
+     android:layout_height="wrap_content"
+     android:layout_alignLeft="@+id/editText1"
+     android:layout_below="@+id/editText1"
+     android:layout_marginTop="34dp"
+     android:ems="10"
+     android:inputType="textPassword" 
+     android:background="#eeeeee"/>
      
-     />
+ <TextView
+     android:id="@+id/textView2"
+     android:layout_width="wrap_content"
+     android:layout_height="wrap_content"
+     android:layout_alignBottom="@+id/editText2"
+     android:layout_alignLeft="@+id/textView1"
+     android:text="Password"
+     android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView
+     android:id="@+id/textView1"
+     android:layout_width="wrap_content"
+     android:layout_height="wrap_content"
+     android:layout_alignBaseline="@+id/editText1"
+     android:layout_alignBottom="@+id/editText1"
+     android:layout_alignParentLeft="true"
+     android:layout_marginLeft="21dp"
+     android:text="Username"
+     android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <Button
+     android:id="@+id/button_login2"
+     android:layout_width="120dp"
+     android:layout_height="wrap_content"
+     android:layout_alignLeft="@+id/textView2"
+     android:layout_alignParentBottom="true"
+     android:layout_marginBottom="140dp"
+     android:background="@color/green"
+     android:text="Login" />
+
+ <Button
+     android:id="@+id/back_button"
+     android:layout_width="120dp"
+     android:layout_height="wrap_content"
+     android:layout_alignBaseline="@+id/button_login2"
+     android:layout_alignBottom="@+id/button_login2"
+     android:layout_alignRight="@+id/editText2"
+     android:layout_marginRight="15dp"
+     android:background="@color/green"
+     android:text="Back" />
+
 </RelativeLayout>