diff --git a/app/src/main/java/com/jens/automation2/ActivityMaintenance.java b/app/src/main/java/com/jens/automation2/ActivityMaintenance.java
index e5056c77..499e713f 100644
--- a/app/src/main/java/com/jens/automation2/ActivityMaintenance.java
+++ b/app/src/main/java/com/jens/automation2/ActivityMaintenance.java
@@ -29,7 +29,7 @@ public class ActivityMaintenance extends Activity
 
     final static String prefsFileName = "com.jens.automation2_preferences.xml";
 
-    TextView tvFileStoreLocation;
+    TextView tvFileStoreLocation, tvAppVersion;
     Button bVolumeTest, bMoreSettings, bSettingsSetToDefault, bShareConfigAndLog, bImportConfiguration, bExportConfiguration;
 
     @Override
@@ -103,6 +103,13 @@ public class ActivityMaintenance extends Activity
         });
 
         tvFileStoreLocation = (TextView)findViewById(R.id.tvFileStoreLocation);
+        tvAppVersion = (TextView)findViewById(R.id.tvAppVersion);
+
+        tvAppVersion.setText(
+                                "Version: " + BuildConfig.VERSION_NAME + Miscellaneous.lineSeparator +
+                                "Version code: " + String.valueOf(BuildConfig.VERSION_CODE) + Miscellaneous.lineSeparator +
+                                "Flavor: " + BuildConfig.FLAVOR
+                            );
     }
 
     @Override
diff --git a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java b/app/src/main/java/com/jens/automation2/ActivityManagePoi.java
index 2e7c38f1..925593cf 100644
--- a/app/src/main/java/com/jens/automation2/ActivityManagePoi.java
+++ b/app/src/main/java/com/jens/automation2/ActivityManagePoi.java
@@ -193,8 +193,8 @@ public class ActivityManagePoi extends Activity
 
 		Miscellaneous.logEvent("i", "POI Manager", "Starting timeout for location search: " + String.valueOf(searchTimeout) + " seconds", 5);
 
-		TimerTask updateBall = new TimeoutTask();
-		timer.scheduleAtFixedRate(updateBall, 0, searchTimeout * 1000);
+		TimerTask timeoutTask = new TimeoutTask();
+		timer.schedule(timeoutTask, searchTimeout * 1000);
 	}
 
 	private void stopTimeout()
diff --git a/app/src/main/res/layout/activity_maintenance.xml b/app/src/main/res/layout/activity_maintenance.xml
index c2a267d7..a2bed376 100644
--- a/app/src/main/res/layout/activity_maintenance.xml
+++ b/app/src/main/res/layout/activity_maintenance.xml
@@ -97,6 +97,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
+        <TextView
+            android:id="@+id/tvAppVersion"
+            android:layout_marginTop="@dimen/default_margin"
+            android:layout_marginVertical="@dimen/default_margin"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
     </androidx.appcompat.widget.LinearLayoutCompat>
 
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_manage_trigger_notification.xml b/app/src/main/res/layout/activity_manage_trigger_notification.xml
index 76c29789..9167bd68 100644
--- a/app/src/main/res/layout/activity_manage_trigger_notification.xml
+++ b/app/src/main/res/layout/activity_manage_trigger_notification.xml
@@ -2,10 +2,9 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="10dp" >
+    android:layout_margin="@dimen/default_margin" >
 
 	<LinearLayout
-		android:layout_margin="@dimen/default_margin"
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
 	    android:orientation="vertical" >
@@ -25,7 +24,9 @@
 
 		<TableLayout
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:shrinkColumns="1"
+			android:stretchColumns="1">
 
 			<TableRow
 				android:layout_marginBottom="@dimen/activity_vertical_margin">
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 546e6705..21af20e5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -212,7 +212,7 @@
     <string name="anotherPoiByThatName">Es gibt bereits einen Ort mit diesem Namen.</string>
     <string name="anotherRuleByThatName">Es gibt bereits eine Regel mit diesem Namen.</string>
     <string name="startOtherActivity">Programm starten</string>
-    <string name="selectApplication">Wählen Sie\neine Anwendung</string>
+    <string name="selectApplication">Anwendung wählen</string>
     <string name="selectPackageOfApplication">Wählen Sie ein Paket der Anwendung</string>
     <string name="selectActivityToBeStarted">Wählen Sie die Activity des Pakets</string>
     <string name="errorStartingOtherActivity">Fehler beim Starten einer anderen Anwendung</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e7dce5b4..d049f2f1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -141,7 +141,7 @@
     <string name="exceeding">exedendo</string>
     <string name="droppingBelow">estendo menos que</string>
     <string name="anyWifi">algún wifi</string>
-    <string name="selectApplication">Elija la app</string>
+    <string name="selectApplication">Elija app</string>
     <string name="selectPackageOfApplication">Elija el paquete de la app</string>
     <string name="selectActivityToBeStarted">Elija la actividad de la app</string>
     <string name="errorStartingOtherActivity">Error encendiendo otra app</string>