diff --git a/README.md b/README.md
index 9250713c..589482e5 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,9 @@ The rename and delete options can be accessed both from the list of stations and
 ### Where does Transistor store its stations?
 Transistor does not save its list of stations in a database. Instead it stores stations as m3u files on your device's external storage. Feel free to tinker with those files using the text editor of your choice. The files are stored in /Android/data/org.y20k.transistor/Collection.
 
+### How do I backup and transfer my radio stations?
+Transistor supports Android 6's [Auto Backup]("http://developer.android.com/about/versions/marshmallow/android-6.0.html#backup") feature. Radio stations are always backed up to your Google account and will be restored at reinstall. On devices running on older versions of Android you must manually save and restore the "Collection" folder.
+
 ### Why does Transistor not have any setting?
 There is nothing to be set ;). Transistor is a very simple app. Depending on your point of view "simple" is either great or lame.
 
diff --git a/app/src/main/java/org/y20k/transistor/helpers/DialogAddStation.java b/app/src/main/java/org/y20k/transistor/helpers/DialogAddStation.java
index f7055c9a..6970f528 100644
--- a/app/src/main/java/org/y20k/transistor/helpers/DialogAddStation.java
+++ b/app/src/main/java/org/y20k/transistor/helpers/DialogAddStation.java
@@ -45,9 +45,8 @@ public interface CollectionChangedListener {
     }
 
 
-    /* Constructor */
+    /* Constructor (default) */
     public DialogAddStation() {
-        mCollectionChangedListener = null;
     }
 
 
@@ -59,6 +58,9 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+        mCollectionChangedListener = null;
+
         // prepare dialog builder
         LayoutInflater inflater = getActivity().getLayoutInflater();
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
diff --git a/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java b/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java
index fbcfe92b..ced62875 100644
--- a/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java
+++ b/app/src/main/java/org/y20k/transistor/helpers/StationContextMenu.java
@@ -66,7 +66,6 @@ public void initialize(Context context, Collection collection, View view, int st
 
     /* Displays context menu */
     public void show() {
-        final View listItem = (View) mView.getParent();
 
         PopupMenu popup = new PopupMenu(mContext, mView);
         popup.inflate(R.menu.menu_main_list_item);
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 318ff3d3..af09dd87 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -7,8 +7,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".MainActivityFragment"
-    android:gravity="right">
+    tools:context=".MainActivityFragment">
 
 
     <LinearLayout
@@ -18,7 +17,7 @@
         android:orientation="horizontal"
         android:divider="#ffffff"
         android:dividerPadding="5dp"
-        android:layout_marginRight="38dp"
+        android:layout_marginEnd="38dp"
         android:visibility="gone">
 
         <TextView
@@ -28,8 +27,8 @@
             android:text="@string/actioncall_message_start_here"
             android:layout_weight="1"
             android:layout_gravity="center_vertical|bottom"
-            android:gravity="bottom|right"
-            android:paddingRight="8dp"
+            android:gravity="bottom|end"
+            android:paddingEnd="8dp"
             style="@style/TextAppearance.AppCompat.Title" />
 
         <ImageView
@@ -39,7 +38,8 @@
             android:contentDescription="@string/descr_arrow_actioncall"
             android:minHeight="?android:attr/listPreferredItemHeight"
             android:background="@drawable/smbl_arrow_actioncall_72dp"
-            android:paddingRight="0dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:layout_marginBottom="4dp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 7b8d907c..60cdeba9 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -35,7 +35,7 @@
             android:ellipsize="end"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="24dp"
+            android:paddingStart="24dp"
             android:singleLine="true"
             android:gravity="center_vertical"
             android:layout_weight="1"
diff --git a/app/src/main/res/layout/list_item_collection.xml b/app/src/main/res/layout/list_item_collection.xml
index fe49f088..69f678cc 100644
--- a/app/src/main/res/layout/list_item_collection.xml
+++ b/app/src/main/res/layout/list_item_collection.xml
@@ -3,8 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:paddingLeft="12dp"
-    android:paddingRight="2dp"
+    android:paddingStart="12dp"
+    android:paddingEnd="2dp"
     android:paddingTop="6dp"
     android:paddingBottom="6dp"
     android:descendantFocusability="blocksDescendants">
@@ -25,8 +25,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
-        android:paddingLeft="24dp"
-        android:text="Example FM"
+        android:paddingStart="24dp"
+        android:text="@string/descr_station_name_example"
         android:layout_weight="1"
         android:singleLine="true"
         android:ellipsize="end"
@@ -47,9 +47,9 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_more_vert_black_24dp"
         android:background="@android:color/transparent"
-        android:paddingLeft="8dp"
+        android:paddingStart="8dp"
         android:paddingTop="4dp"
-        android:paddingRight="4dp"
+        android:paddingEnd="4dp"
         android:paddingBottom="4dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 97c88b92..c90d053b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -8,6 +8,7 @@
     <string name="descr_playback_button">Großer Play-Knopf</string>
     <string name="descr_playback_indicator">Playback Signal</string>
     <string name="descr_station_name">Name der Radiostation</string>
+    <string name="descr_station_name_example">FM Beispiel</string>
     <string name="descr_arrow_actioncall">Pfeil, der auf das Sybol für Station hinzufügen zeigt</string>
     <string name="descr_station_icon">Logo der Radiostation</string>
     <string name="dialog_add_station_button">Hinzufügen</string>
@@ -37,13 +38,12 @@
     <string name="actioncall_message_start_here">Eine neue Station hinzufügen</string>
     <string name="descr_playback_indicator_started">Playback Signal</string>
 
-
     <string name="html_about"><![CDATA[<!DOCTYPE html>
     <html>
         <body>
             <h1>Über Transistor</h1>
             <h2>Radio App für Android</h2>
-            <h3>Version 0.9 (&quot;Young Americans&quot;)</h3>
+            <h3>Version 1.0 (&quot;Lady Stardust&quot;)</h3>
             <p>Transistor ist eine mininalistische App um über das Internet Radio hören zu können. Die App speichert Stationen als Textdateien im externen Gerätespeicher ab - und zwar hier: /Android/data/org.y20k.transistor/Collection. Transistor spielt Streams ab, die in M3U- und PLS-Dateien verpackt sind.</p>
             <p>Transistor ist Freie Software. Die App ist unter der MIT Open Source Lizenz veröffentlicht. Der Quellcode liegt auf GitHub. GitHub ist auch ein guter Ort, um Bugs zu melden oder um sich an der Weiterentwicklung zu beteiligen.</p>
             <p><a href="https://github.com/y20k/transistor">https://github.com/y20k/transistor</a></p>
@@ -68,10 +68,11 @@
             <p>Optionen für Löschen und Umbenennen finden sich sowohl in der Listenansicht, als auch in der Einzelansicht für Play und Stop - dazu einfach auf das Drei-Punkte-Menü tippen. Es ist zudem möglich die Liste der Stationen direkt mit einem Datei-Browser zu bearbeiten (siehe nächste Frage).</p>
             <h2>Wo speichert Transistor seine Radiostationen ab?</h2>
             <p>Transistor speichert seine Stationen nicht in einer Datenbank. Stattdessen werden Stationen als M3U-Textdateien im externen Gerätespeicher abgelegt.  Diese können auch manuell mit Hilfe eines Texteditors bearbeitet werden. Die Dateien finden sich hier: /Android/data/org.y20k.transistor/Collection</p>
+            <h2>Wie kann ich meine Radiostationen sichern und wiederherstellen?<h2>
+            <p>Transistor unterstützt die Auto Backup Funktion von Android 6. Alle Radiostationen werden im Google-Konto gespeichert. Bei einer Neu-Installation der App werden sie automatisch wiederhergestellt. Auf Geräten mit älteren Android-Versionen muss man den Ordner &quot;Collection&quot; manuell sichern und gegebenenfalls zurückkopieren.</p>
             <h2>Warum hat Transistor keine Einstellungen?</h2>
             <p>Es gibt schlicht nichts einzustellen ;). Transistor ist eine sehr einfache App. Abhängig vom eigenen Standpunkt ist "einfach" entweder großartig oder mies.</p>
         </body>
     </html>]]></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 b1dd720a..a4c5f11d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="descr_overflow_button">Display options for radio station</string>
     <string name="descr_station_icon">Icon of radio station</string>
     <string name="descr_station_name">Name of radio station</string>
+    <string name="descr_station_name_example">Example FM</string>
     <string name="descr_playback_button">Big playback button</string>
     <string name="descr_playback_indicator">Indicator for running playback</string>
     <string name="descr_playback_indicator_started">Indicator for running playback</string>
@@ -81,6 +82,8 @@
             <p>The rename and delete options can be accessed both from the list of stations and from the now playing screen. Just tap on the three dots symbol. You can manage the list of stations also from a file browser (see next question).</p>
             <h2>Where does Transistor store its stations?</h2>
             <p>Transistor does not save its list of stations in a database. Instead it stores stations as m3u files on your device\'s external storage. Feel free to tinker with those files using the texteditor of your choice. The files are stored in /Android/data/org.y20k.transistor/Collection.</p>
+            <h2>How do I backup and transfer my radio stations?<h2>
+            <p>Transistor supports Android 6\'s Auto Backup feature. Radio stations are always backed up to your Google account and will be restored at reinstall. On devices running on older versions of Android you must manually save and restore the &quot;Collection&quot; folder.</p>
             <h2>Why does Transistor not have any setting?</h2>
             <p>There is nothing to be set ;). Transistor is a very simple app. Depending on your point of view "simple" is either great or lame.</p>
         </body>
@@ -88,5 +91,4 @@
 
 
 
-
 </resources>