diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 0c1bdf9..0a33860 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -10,7 +10,7 @@
 
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:icon="@drawable/icon">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="de.itsblue.scstw.MainActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/resources/qml/MainPage/CenterContent.qml b/resources/qml/MainPage/CenterContent.qml
index 82b5b67..baac284 100644
--- a/resources/qml/MainPage/CenterContent.qml
+++ b/resources/qml/MainPage/CenterContent.qml
@@ -118,7 +118,7 @@ Item {
 
                                     Label {
                                         Layout.preferredWidth: parent.width
-                                        Layout.preferredHeight: parent.height * 0.1
+                                        Layout.preferredHeight: parent.height * 0.15
 
                                         font.pixelSize: height * 0.8
                                         fontSizeMode: Text.Fit
@@ -134,7 +134,9 @@ Item {
                                     StateIndicator {
 
                                         Layout.fillWidth: true
+                                        Layout.maximumWidth: height * 0.7
                                         Layout.fillHeight: true
+                                        Layout.alignment: Layout.Center
 
                                         backgroundColor: appTheme.theme.colors.background
                                         successColor: appTheme.theme.colors.success
@@ -150,9 +152,14 @@ Item {
                                             anchors.fill: parent
 
                                             onClicked: {
-                                                var disabled = timerStatusColumn.thisTimer["state"] !== ScStwTimer.DISABLED
-                                                console.log("setting timer to disabled: " + disabled)
-                                                scStwRemoteRace.setTimerDisabled(timerStatusColumn.thisTimer["id"], disabled)
+                                                if(scStwRemoteRace.timers.length > 1) {
+                                                    var disabled = timerStatusColumn.thisTimer["state"] !== ScStwTimer.DISABLED
+                                                    console.log("setting timer to disabled: " + disabled)
+                                                    scStwRemoteRace.setTimerDisabled(timerStatusColumn.thisTimer["id"], disabled)
+                                                }
+                                                else {
+                                                    console.log("skipping timer disabling, only one timer!")
+                                                }
                                             }
                                         }
                                     }
@@ -164,6 +171,8 @@ Item {
                             width: parent.width
                             height: parent.height * 0.1
 
+                            visible: scStwRemoteRace.timers.length > 1
+
                             font.pixelSize: height * 0.6
                             fontSizeMode: Text.Fit
                             minimumPointSize: 1
@@ -172,7 +181,7 @@ Item {
 
                             color: appTheme.theme.colors.text
 
-                            text: "Tap on a lane to disable it"
+                            text: "Tap a lane to disable it"
                         }
 
                     }
diff --git a/shared-libraries b/shared-libraries
index 37bea91..43d9f80 160000
--- a/shared-libraries
+++ b/shared-libraries
@@ -1 +1 @@
-Subproject commit 37bea9105f1c7e0c8f1a209da3d5043c61abfb44
+Subproject commit 43d9f80f60451f111a6535e46ef51b3fa08e33e4
diff --git a/sources/main.cpp b/sources/main.cpp
index 104ba58..f7c8c29 100644
--- a/sources/main.cpp
+++ b/sources/main.cpp
@@ -17,7 +17,7 @@
 
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
- #include <QQmlEngine>
+#include <QQmlEngine>
 #include <QSqlDatabase>
 #include <QSqlError>
 #include <QDebug>
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 
     const QUrl url(QStringLiteral("qrc:/main.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
-                     &app, [url](QObject *obj, const QUrl &objUrl) {
+    &app, [url](QObject *obj, const QUrl &objUrl) {
         if (!obj && url == objUrl)
             QCoreApplication::exit(-1);
     }, Qt::QueuedConnection);