diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 5fdb88d..a767e2d 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -7,6 +7,7 @@
 	android:weightSum="6"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="#080808"
 	android:paddingBottom="@dimen/activity_vertical_margin"
 	android:paddingLeft="@dimen/activity_horizontal_margin"
 	android:paddingRight="@dimen/activity_horizontal_margin"
@@ -14,74 +15,130 @@
 	tools:context="us.keithirwin.tracman.LoginActivity"
 	android:clickable="true">
 
-	<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
-				  android:orientation="vertical"
-				  android:layout_weight="1"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
+	<!-- Header -->
+	<RelativeLayout android:orientation="vertical"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:gravity="center" >
+
+		<!-- Logo -->
 		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:contentDescription="@string/logo_description"
 			android:padding="5dp"
-			android:src="@drawable/logo_by"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"/>
+			android:src="@drawable/logo_by" />
+
+		<!-- Title -->
 		<TextView
 			android:id="@+id/login_title"
-			android:layout_width="match_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="60dp"
 			android:layout_marginStart="60dp"
-			android:gravity="center"
 			android:text="@string/app_name"
 			android:textSize="50sp"
-			android:textColor="@color/Yellow"
-			android:layout_alignParentRight="true"
-			android:layout_alignParentEnd="true" />
+			android:textColor="@color/Yellow"/>
+
 	</RelativeLayout>
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
-				  android:orientation="vertical"
-				  android:layout_weight="3"
+	<!-- Description -->
+	<LinearLayout android:orientation="vertical"
+				  android:layout_weight="1"
 				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
+				  android:layout_height="wrap_content" >
 		<TextView
 			android:id="@+id/login_description"
 			android:text="@string/login_description"
-			android:textSize="24sp"
+			android:textSize="20sp"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
-
 	</LinearLayout>
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
-				  android:layout_width="match_parent"
-				  android:layout_weight="1"
-				  android:layout_height="wrap_content">
-		<com.google.android.gms.common.SignInButton
-			android:id="@+id/google_sign_in_button"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:layout_gravity="center"/>
-
-	</LinearLayout>
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
+	<!-- Social login buttons -->
+	<LinearLayout android:layout_width="match_parent"
 				  android:layout_height="wrap_content"
+				  android:layout_weight="3"
+				  android:layout_marginBottom="30px" >
+
+		<!-- Google -->
+		<ImageButton
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:src="@drawable/social_google" />
+
+		<!-- Facebook -->
+		<ImageButton
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:src="@drawable/social_facebook" />
+
+		<!-- Twitter -->
+		<ImageButton
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:src="@drawable/social_twitter" />
+
+	</LinearLayout>
+
+	<!-- Login form -->
+	<LinearLayout android:layout_width="match_parent"
+				  android:layout_height="wrap_content"
+				  android:layout_weight="1"
+				  android:orientation="vertical" >
+
+		<!-- Email -->
+		<EditText
+			android:id="@+id/login_email"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/email"
+			android:textSize="24sp"/>
+
+		<!-- Password -->
+		<EditText
+			android:id="@+id/login_password"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/password"
+			android:textSize="24sp"/>
+
+		<!-- Submit -->
+		<Button
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="3"
+			android:text="@string/login_button_text"
+			android:textSize="32sp" />
+
+	</LinearLayout>
+
+	<!-- Extra text -->
+	<LinearLayout android:layout_height="wrap_content"
 				  android:layout_width="match_parent"
+				  android:orientation="vertical"
 				  android:layout_weight="1">
+
+		<!-- Forgot password link -->
+		<TextView android:id="@+id/login_forgot_password"
+				  android:text="@string/login_forgot_password"
+				  android:layout_width="match_parent"
+				  android:layout_height="wrap_content"
+				  android:textColor="@color/Yellow"
+				  android:textSize="24sp" />
+
+		<!-- Errors -->
 		<TextView
-		android:id="@+id/login_error"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:gravity="center"
-		android:textColor="@color/Red"
-		android:textSize="22sp" />
+			android:id="@+id/login_error"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:textColor="@color/Red"
+			android:textSize="22sp" />
 
 	</LinearLayout>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 656f621..d355afa 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="about_back_button">Zurück</string>
-	<string name="about_license"><a href="https://tracman.org/license/">Lizenz im Browser zeigen (englisch)</a></string>
-	<string name="about_name">Über</string>
+    <string name="about_name">Über</string>
 	<string name="broadcast_disabled">Sendungen deaktiviert</string>
 	<string name="bugs_name">Problembericht</string>
 	<string name="connected">Verbindung festgestellt</string>
@@ -11,7 +10,7 @@
 	<string name="google_connection_error">FEHLER: Könnte nicht zum Google API Server verbinden. </string>
 	<string name="help_name">Hilfe</string>
 	<string name="loading">Ladet…</string>
-	<string name="login_description">Auf dem Knopf klicken, einzuloggen.  Ein Tracman Konto ist erforderlich.  Falls Sie keiner haben, dürfen Sie <a href="https://tracman.org/login">mit ihrer Googlekonto mitbewerben</a>.</string>
+	<string name="login_description">"Zu Tracman einloggen.  Wenn Sie kein Konto haben, können Sie <a href="https://tracman.org/login#join">einen neuen machen</a>.  "</string>
 	<string name="login_name">Einloggen</string>
 	<string name="login_no_user_error">FEHLER: Nutzer nicht gefunden. </string>
 	<string name="logout_name">Ausloggen</string>
@@ -51,4 +50,8 @@
 	<string name="pref_title_gps_broadcast">Sendungen einschalten</string>
 	<string name="pref_title_broadcast_priority">Aktualisierung Vorrang</string>
 	<string name="not_connected">Kein Internet Zugang</string>
+	<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Passwort vergessen?</a></string>
+	<string name="login_button_text">Einloggen</string>
+    <string name="email">Email</string>
+	<string name="password">Passwort</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3c6b3d3..87573ed 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,8 +3,7 @@
 	<string name="about_back_button">Atras</string>
 	<string name="about_name">Info</string>
 	<string name="connecting">conectando…</string>
-	<string name="about_license"><a href="https://tracman.org/license/">Mostrar licensia en el navegador (inglés)</a></string>
-	<string name="loading">Cargando…</string>
+    <string name="loading">Cargando…</string>
 	<string name="disconnected">Conexión perdida</string>
 	<string name="connected">Conexión establecida</string>
 	<string name="bugs_name">Informe de error</string>
@@ -17,7 +16,7 @@
 	<string name="broadcast_disabled">Transmisiónes apagado</string>
 	<string name="google_connection_error">ERROR: No se puede conectar al Google API servidor. </string>
 	<string name="help_name">Ayuda</string>
-	<string name="login_description">"Haga clic en el botón abajo para iniciar una sesión. Se necisita una cuenta de Tracman. Si no tiene uno, puede <a href="https://tracman.org/login">participar con sua cuenta Google</a>. "</string>
+	<string name="login_description">"Iniciar una sesión. Si no tiene una cuenta de Tracman, puede <a href="https://tracman.org/login">participar</a>. "</string>
 	<string name="login_name">Iniciar sesión</string>
 	<string name="login_no_user_error">ERROR: Usario no encontrado</string>
 	<string name="logout_name">Cerrar sesión</string>
@@ -49,5 +48,9 @@
 		<item>Sin energía</item>
 	</string-array>
 	<string name="pref_title_gps_broadcast">Encender transmisiónes</string>	<string name="pref_broadcast_category_title">Actualizaciones de ubicación</string>
-	<string name="not_connected">"Sin conexión a Internet "</string>
+	<string name="not_connected">Sin conexión a Internet</string>
+	<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Olividé su contrasena?</a></string>
+	<string name="login_button_text">Inciar session</string>
+    <string name="email">email</string>
+	<string name="password">contrasena</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 209e42e..0bf832f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
 	<!-- Strings related to login -->
 	<string name="login_name">Login</string>
 	<string name="logout_name">Logout</string>
-	<string name="login_description">"Click the button below to log in.  You will need a Tracman account.  If you don't have one, you can <a href="https://tracman.org/login">join with your google account</a>.  "</string>
+	<string name="login_description">"Log in to Tracman.  If you don't have one an account, you can <a href="https://tracman.org/login#join">create one</a>.  "</string>
 	<string name="server_connection_error">ERROR: Unable to connect to Tracman server.  </string>
 
 	<!-- Strings related to notifications -->
@@ -91,7 +91,6 @@
 
 	<!--Strings related to about-->
 	<string name="about_name">About</string>
-	<string name="about_license"><a href="https://tracman.org/license/">View license online</a></string>
 	<string name="about_back_button">Back</string>
 
 	<!--Strings related to suggestions-->
@@ -99,5 +98,9 @@
 
 	<!--Strings related to bugs-->
 	<string name="bugs_name">Bug report</string>
+	<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Forgot your password?</a>
+	<string name="login_button_text">Login</string>
+    <string name="email">email</string>
+	<string name="password">password</string>
 
 </resources>