diff --git a/gfx/add_person.png b/gfx/add_person.png
new file mode 100644
index 0000000..6e2ffc8
Binary files /dev/null and b/gfx/add_person.png differ
diff --git a/gfx/add_person.xcf b/gfx/add_person.xcf
new file mode 100644
index 0000000..7e24011
Binary files /dev/null and b/gfx/add_person.xcf differ
diff --git a/meteroid/meteroid-meteroid.apk b/meteroid/meteroid-meteroid.apk
index 1b93625..b4a9c98 100644
Binary files a/meteroid/meteroid-meteroid.apk and b/meteroid/meteroid-meteroid.apk differ
diff --git a/meteroid/src/main/AndroidManifest.xml b/meteroid/src/main/AndroidManifest.xml
index 1e54863..824d3e3 100644
--- a/meteroid/src/main/AndroidManifest.xml
+++ b/meteroid/src/main/AndroidManifest.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.chaosdorf.meteroid"
-    android:versionCode="3"
-    android:versionName="1.2">
+          package="de.chaosdorf.meteroid"
+          android:versionCode="4"
+          android:versionName="1.3">
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="18" />
+        android:targetSdkVersion="18"/>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"
@@ -21,26 +21,26 @@
             android:name=".MainActivity"
             android:label="@string/app_name">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
         <activity
             android:name=".SetHostname"
-            android:label="@string/set_hostname_label" />
+            android:label="@string/set_hostname_label"/>
 
         <activity
             android:name=".PickUsername"
-            android:label="@string/pick_username_label" />
+            android:label="@string/pick_username_label"/>
 
         <activity
             android:name=".BuyDrink"
-            android:label="@string/app_name" />
+            android:label="@string/buy_drink_label"/>
 
         <activity
             android:name=".AddUserActivity"
-            android:label="@string/app_name" />
+            android:label="@string/add_user_label"/>
 
     </application>
 
diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java b/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java
index 992f579..710d145 100644
--- a/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java
+++ b/meteroid/src/main/java/de/chaosdorf/meteroid/AddUserActivity.java
@@ -6,7 +6,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.View;
-import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 import java.util.Date;
@@ -28,13 +28,24 @@ protected void onCreate(Bundle savedInstanceState)
 		super.onCreate(savedInstanceState);
 		activity = this;
 		setContentView(R.layout.activity_add_user);
-		Button addButton = (Button) findViewById(R.id.button_add_user);
 
 		final TextView usernameText = (TextView) findViewById(R.id.username);
 		final TextView emailText = (TextView) findViewById(R.id.email);
 		final TextView balanceText = (TextView) findViewById(R.id.balance);
 		final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
+		final ImageButton backButton = (ImageButton) findViewById(R.id.button_back);
+		backButton.setOnClickListener(new View.OnClickListener()
+		{
+			public void onClick(View view)
+			{
+				Intent intent = new Intent(activity, PickUsername.class);
+				startActivity(intent);
+				finish();
+			}
+		});
+
+		final ImageButton addButton = (ImageButton) findViewById(R.id.button_add_user);
 		addButton.setOnClickListener(new View.OnClickListener()
 		{
 			@Override
diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/BuyDrink.java b/meteroid/src/main/java/de/chaosdorf/meteroid/BuyDrink.java
index 3e0b025..404ccb7 100644
--- a/meteroid/src/main/java/de/chaosdorf/meteroid/BuyDrink.java
+++ b/meteroid/src/main/java/de/chaosdorf/meteroid/BuyDrink.java
@@ -63,6 +63,7 @@ protected void onCreate(Bundle savedInstanceState)
 		{
 			public void onClick(View view)
 			{
+				Utility.resetUsername(activity);
 				Intent intent = new Intent(activity, PickUsername.class);
 				startActivity(intent);
 				finish();
diff --git a/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java b/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java
index a3b73dd..628455e 100644
--- a/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java
+++ b/meteroid/src/main/java/de/chaosdorf/meteroid/PickUsername.java
@@ -212,6 +212,11 @@ public View getView(int position, View convertView, ViewGroup parent)
 			icon.setContentDescription(user.getName());
 			label.setText(user.getName());
 
+			if (user.getId() == NEW_USER_ID)
+			{
+				icon.setImageDrawable(getResources().getDrawable(R.drawable.add_person));
+			}
+
 			return view;
 		}
 	}
diff --git a/meteroid/src/main/res/drawable-hdpi/navigation_back.png b/meteroid/src/main/res/drawable-hdpi/button_back.png
similarity index 100%
rename from meteroid/src/main/res/drawable-hdpi/navigation_back.png
rename to meteroid/src/main/res/drawable-hdpi/button_back.png
diff --git a/meteroid/src/main/res/drawable-hdpi/navigation_reload.png b/meteroid/src/main/res/drawable-hdpi/button_reload.png
similarity index 100%
rename from meteroid/src/main/res/drawable-hdpi/navigation_reload.png
rename to meteroid/src/main/res/drawable-hdpi/button_reload.png
diff --git a/meteroid/src/main/res/drawable-hdpi/button_save.png b/meteroid/src/main/res/drawable-hdpi/button_save.png
new file mode 100644
index 0000000..306d55a
Binary files /dev/null and b/meteroid/src/main/res/drawable-hdpi/button_save.png differ
diff --git a/meteroid/src/main/res/drawable-mdpi/navigation_back.png b/meteroid/src/main/res/drawable-mdpi/button_back.png
similarity index 100%
rename from meteroid/src/main/res/drawable-mdpi/navigation_back.png
rename to meteroid/src/main/res/drawable-mdpi/button_back.png
diff --git a/meteroid/src/main/res/drawable-mdpi/navigation_reload.png b/meteroid/src/main/res/drawable-mdpi/button_reload.png
similarity index 100%
rename from meteroid/src/main/res/drawable-mdpi/navigation_reload.png
rename to meteroid/src/main/res/drawable-mdpi/button_reload.png
diff --git a/meteroid/src/main/res/drawable-mdpi/button_save.png b/meteroid/src/main/res/drawable-mdpi/button_save.png
new file mode 100644
index 0000000..ad07695
Binary files /dev/null and b/meteroid/src/main/res/drawable-mdpi/button_save.png differ
diff --git a/meteroid/src/main/res/drawable-xhdpi/navigation_back.png b/meteroid/src/main/res/drawable-xhdpi/button_back.png
similarity index 100%
rename from meteroid/src/main/res/drawable-xhdpi/navigation_back.png
rename to meteroid/src/main/res/drawable-xhdpi/button_back.png
diff --git a/meteroid/src/main/res/drawable-xhdpi/navigation_reload.png b/meteroid/src/main/res/drawable-xhdpi/button_reload.png
similarity index 100%
rename from meteroid/src/main/res/drawable-xhdpi/navigation_reload.png
rename to meteroid/src/main/res/drawable-xhdpi/button_reload.png
diff --git a/meteroid/src/main/res/drawable-xhdpi/button_save.png b/meteroid/src/main/res/drawable-xhdpi/button_save.png
new file mode 100644
index 0000000..2720602
Binary files /dev/null and b/meteroid/src/main/res/drawable-xhdpi/button_save.png differ
diff --git a/meteroid/src/main/res/drawable/add_person.png b/meteroid/src/main/res/drawable/add_person.png
new file mode 100644
index 0000000..6e2ffc8
Binary files /dev/null and b/meteroid/src/main/res/drawable/add_person.png differ
diff --git a/meteroid/src/main/res/drawable/navigation_back.png b/meteroid/src/main/res/drawable/button_back.png
similarity index 100%
rename from meteroid/src/main/res/drawable/navigation_back.png
rename to meteroid/src/main/res/drawable/button_back.png
diff --git a/meteroid/src/main/res/drawable/navigation_reload.png b/meteroid/src/main/res/drawable/button_reload.png
similarity index 100%
rename from meteroid/src/main/res/drawable/navigation_reload.png
rename to meteroid/src/main/res/drawable/button_reload.png
diff --git a/meteroid/src/main/res/drawable/button_save.png b/meteroid/src/main/res/drawable/button_save.png
new file mode 100644
index 0000000..2720602
Binary files /dev/null and b/meteroid/src/main/res/drawable/button_save.png differ
diff --git a/meteroid/src/main/res/layout/activity_add_user.xml b/meteroid/src/main/res/layout/activity_add_user.xml
index db11731..3f31f8c 100644
--- a/meteroid/src/main/res/layout/activity_add_user.xml
+++ b/meteroid/src/main/res/layout/activity_add_user.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".AddUserActivity">
-
-    <TextView
-        android:id="@+id/text"
-        android:text="@string/add_user_label"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content" />
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              tools:context=".AddUserActivity">
 
     <EditText
         android:id="@+id/username"
@@ -23,7 +17,7 @@
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:password="false"
-        android:phoneNumber="false" />
+        android:phoneNumber="false"/>
 
     <EditText
         android:id="@+id/email"
@@ -32,7 +26,7 @@
         android:layout_width="fill_parent"
         android:password="false"
         android:phoneNumber="false"
-        android:inputType="textEmailAddress" />
+        android:inputType="textEmailAddress"/>
 
     <EditText
         android:id="@+id/balance"
@@ -41,13 +35,30 @@
         android:layout_width="fill_parent"
         android:password="false"
         android:phoneNumber="false"
-        android:numeric="decimal" />
+        android:numeric="decimal"/>
 
-    <Button
-        android:layout_width="wrap_content"
+    <LinearLayout
         android:layout_height="wrap_content"
-        android:text="@string/button_add"
-        android:id="@+id/button_add_user"
-        android:layout_gravity="center" />
+        android:layout_width="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="right"
+        >
+
+        <ImageButton
+            android:id="@+id/button_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:src="@drawable/button_back"
+            android:contentDescription="@string/button_back"/>
+
+        <ImageButton
+            android:id="@+id/button_add_user"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/button_save"
+            android:contentDescription="@string/button_save"/>
+
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/meteroid/src/main/res/layout/activity_buy_drink.xml b/meteroid/src/main/res/layout/activity_buy_drink.xml
index bac7cc4..99e9483 100644
--- a/meteroid/src/main/res/layout/activity_buy_drink.xml
+++ b/meteroid/src/main/res/layout/activity_buy_drink.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".BuyDrink">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              tools:context=".BuyDrink">
 
     <!-- Display user data -->
     <LinearLayout
@@ -21,7 +21,7 @@
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/app_name" />
+            android:contentDescription="@string/app_name"/>
 
         <LinearLayout
             android:orientation="vertical"
@@ -34,32 +34,32 @@
                 android:layout_width="200dp"
                 android:paddingLeft="9dip"
                 android:layout_height="wrap_content"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
             <TextView
                 android:id="@+id/balance"
                 android:layout_width="200dp"
                 android:paddingLeft="9dip"
                 android:layout_height="wrap_content"
-                android:textSize="16sp" />
+                android:textSize="16sp"/>
 
         </LinearLayout>
 
         <ImageButton
             android:id="@+id/button_back"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_gravity="right"
-            android:src="@drawable/navigation_back"
-            android:contentDescription="@string/button_back" />
+            android:src="@drawable/button_back"
+            android:contentDescription="@string/button_back"/>
 
         <ImageButton
             android:id="@+id/button_reload"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_gravity="right"
-            android:src="@drawable/navigation_reload"
-            android:contentDescription="@string/button_reload" />
+            android:src="@drawable/button_reload"
+            android:contentDescription="@string/button_reload"/>
 
     </LinearLayout>
 
@@ -69,7 +69,7 @@
         android:layout_height="fill_parent"
         android:textSize="16sp"
         android:visibility="gone"
-        android:text="@string/buy_drink_error" />
+        android:text="@string/buy_drink_error"/>
 
     <!-- Display drinks -->
     <ListView
@@ -77,6 +77,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:drawSelectorOnTop="false" />
+        android:drawSelectorOnTop="false"/>
 
 </LinearLayout>
diff --git a/meteroid/src/main/res/layout/activity_buy_drink_item.xml b/meteroid/src/main/res/layout/activity_buy_drink_item.xml
index 87416ff..b0c8fdc 100644
--- a/meteroid/src/main/res/layout/activity_buy_drink_item.xml
+++ b/meteroid/src/main/res/layout/activity_buy_drink_item.xml
@@ -1,10 +1,10 @@
 <?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="80dip"
-    android:gravity="center_vertical"
-    android:ignoreGravity="@+id/icon">
+                android:layout_width="fill_parent"
+                android:layout_height="80dip"
+                android:gravity="center_vertical"
+                android:ignoreGravity="@+id/icon">
 
     <ImageView
         android:id="@+id/icon"
@@ -13,7 +13,7 @@
         android:layout_alignParentBottom="true"
         android:layout_width="70dp"
         android:layout_height="70dp"
-        android:contentDescription="@string/app_name" />
+        android:contentDescription="@string/app_name"/>
 
     <TextView
         android:id="@+id/label"
@@ -21,6 +21,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/icon"
-        android:textSize="16sp" />
+        android:textSize="16sp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/meteroid/src/main/res/layout/activity_pick_username.xml b/meteroid/src/main/res/layout/activity_pick_username.xml
index 95e1578..b3e2077 100644
--- a/meteroid/src/main/res/layout/activity_pick_username.xml
+++ b/meteroid/src/main/res/layout/activity_pick_username.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".PickUsername">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                tools:context=".PickUsername">
 
     <LinearLayout
         android:id="@+id/pick_username_error"
@@ -21,7 +21,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textSize="16sp"
-            android:text="@string/pick_username_error" />
+            android:text="@string/pick_username_error"/>
 
         <LinearLayout
             android:layout_height="wrap_content"
@@ -34,16 +34,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
-                android:src="@drawable/navigation_back"
-                android:contentDescription="@string/button_back" />
+                android:src="@drawable/button_back"
+                android:contentDescription="@string/button_back"/>
 
             <ImageButton
                 android:id="@+id/button_reload"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
-                android:src="@drawable/navigation_reload"
-                android:contentDescription="@string/button_reload" />
+                android:src="@drawable/button_reload"
+                android:contentDescription="@string/button_reload"/>
 
         </LinearLayout>
     </LinearLayout>
@@ -56,9 +56,9 @@
         android:layout_height="fill_parent"
         android:columnWidth="100dp"
         android:numColumns="auto_fit"
-        android:verticalSpacing="10dp"
+        android:verticalSpacing="12dp"
         android:horizontalSpacing="5dp"
         android:stretchMode="columnWidth"
-        android:gravity="center" />
+        android:gravity="center"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/meteroid/src/main/res/layout/activity_pick_username_item.xml b/meteroid/src/main/res/layout/activity_pick_username_item.xml
index caee5b2..b480ff5 100644
--- a/meteroid/src/main/res/layout/activity_pick_username_item.xml
+++ b/meteroid/src/main/res/layout/activity_pick_username_item.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="100dp"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
-    tools:ignore="UseCompoundDrawables">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="100dp"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              tools:ignore="UseCompoundDrawables">
 
     <ImageView
         android:id="@+id/icon"
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_gravity="center_horizontal"
-        android:contentDescription="@string/app_name" />
+        android:contentDescription="@string/app_name"/>
 
     <TextView
         android:id="@+id/label"
@@ -21,6 +21,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:textSize="14sp" />
+        android:textSize="14sp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/meteroid/src/main/res/layout/activity_set_hostname.xml b/meteroid/src/main/res/layout/activity_set_hostname.xml
index 6ec6c91..7125d15 100644
--- a/meteroid/src/main/res/layout/activity_set_hostname.xml
+++ b/meteroid/src/main/res/layout/activity_set_hostname.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".SetHostname">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              tools:context=".SetHostname">
 
     <TextView
         android:id="@+id/text"
         android:text="@string/set_hostname"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content" />
+        android:layout_width="wrap_content"/>
 
     <EditText
         android:inputType="textUri"
@@ -24,13 +24,13 @@
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:password="false"
-        android:phoneNumber="false" />
+        android:phoneNumber="false"/>
 
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/button_save"
         android:id="@+id/button_save"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/meteroid/src/main/res/menu/buydrink.xml b/meteroid/src/main/res/menu/buydrink.xml
index cee5ed6..6f7f361 100644
--- a/meteroid/src/main/res/menu/buydrink.xml
+++ b/meteroid/src/main/res/menu/buydrink.xml
@@ -3,17 +3,17 @@
         android:id="@+id/reset_hostname"
         android:title="@string/menu_reset_hostname"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        android:showAsAction="never"/>
     <item
         android:id="@+id/reset_username"
         android:title="@string/menu_reset_username"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        android:showAsAction="never"/>
     <item
         android:id="@+id/multi_user_mode"
         android:title="@string/menu_multi_user_mode"
         android:checkable="true"
         android:checked="false"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        android:showAsAction="never"/>
 </menu>
diff --git a/meteroid/src/main/res/menu/pickusername.xml b/meteroid/src/main/res/menu/pickusername.xml
index e6a2395..6948c61 100644
--- a/meteroid/src/main/res/menu/pickusername.xml
+++ b/meteroid/src/main/res/menu/pickusername.xml
@@ -3,12 +3,12 @@
         android:id="@+id/reset_hostname"
         android:title="@string/menu_reset_hostname"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        android:showAsAction="never"/>
     <item
         android:id="@+id/multi_user_mode"
         android:title="@string/menu_multi_user_mode"
         android:checkable="true"
         android:checked="false"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        android:showAsAction="never"/>
 </menu>
diff --git a/meteroid/src/main/res/values/strings.xml b/meteroid/src/main/res/values/strings.xml
index 3d4b497..8b919a3 100644
--- a/meteroid/src/main/res/values/strings.xml
+++ b/meteroid/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
 
     <!-- Pick username -->
     <string name="pick_username_label">Pick your username</string>
-    <string name="pick_username_new_user">New</string>
+    <string name="pick_username_new_user">New user</string>
     <string name="pick_username_error">Could not load user list. Please check network connection or
         reset hostname to proceed.
     </string>
@@ -28,10 +28,10 @@
     <string name="add_user_email">Email</string>
     <string name="add_user_balance">Balance</string>
     <string name="add_user_empty_username">Please enter a username</string>
-    <string name="add_user_empty_email">Please enter an email address</string>
     <string name="add_user_empty_balance">Please enter a balance</string>
 
     <!-- Buy drink -->
+    <string name="buy_drink_label">Buy drink</string>
     <string name="buy_drink_pending">Please wait for current transaction…</string>
     <string name="buy_drink_bought_drink">Successfully bought drink</string>
     <string name="buy_drink_added_money">Successfully added money</string>
@@ -42,7 +42,6 @@
     <!-- Buttons -->
     <string name="button_back">Back</string>
     <string name="button_reload">Reload</string>
-    <string name="button_add">Add</string>
     <string name="button_save">Save</string>
     <string name="button_ok">OK</string>