Index: sources/AlarmGenerator.cpp
===================================================================
diff -u -r28845c70151c3fb6f1a8e92c82da0232b6ca854a -r90d21320e3fafd64ee2e9241ce4065aca86625ff
--- sources/AlarmGenerator.cpp	(.../AlarmGenerator.cpp)	(revision 28845c70151c3fb6f1a8e92c82da0232b6ca854a)
+++ sources/AlarmGenerator.cpp	(.../AlarmGenerator.cpp)	(revision 90d21320e3fafd64ee2e9241ce4065aca86625ff)
@@ -64,22 +64,6 @@
     return data;
 }
 
-/*!
- * \brief   AlarmGenerator::ALARM_ID_UI_POST_FAILURE_SDCARD
- * \details generates the ALARM_ID_UI_POST_FAILURE_SDCARD alarm.
- * \return  The AlarmStatusData filled with appropriate data for the alarm.
- */
-const AlarmStatusData AlarmGenerator::ALARM_ID_UI_POST_FAILURE_SDCARD()
-{
-    AlarmStatusData data;
-    data.mState         = GuiAlarmPriority::ALARM_PRIORITY_HIGH;        // Alarm priority
-    data.mTop           = GuiAlarmID::ALARM_ID_HD_UI_POST_FAILURE_SDCARD;   // Alarm ID
-    data.mMuteTimeout   = 0;                                            // Alarm timeout
-    data.mEscalatesIn   = 0;                                            // Alarm Escalate Time Period
-    data.mFlags         = setBits(NO_BUTTON);                           // No button since there is no HD to communicate.
-    return data;
-}
-
 const AlarmStatusData AlarmGenerator::ALARM_ID_NO_ALARM()
 {
     AlarmStatusData data;
Index: sources/AlarmGenerator.h
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r90d21320e3fafd64ee2e9241ce4065aca86625ff
--- sources/AlarmGenerator.h	(.../AlarmGenerator.h)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/AlarmGenerator.h	(.../AlarmGenerator.h)	(revision 90d21320e3fafd64ee2e9241ce4065aca86625ff)
@@ -57,7 +57,6 @@
     //      static const AlarmStatusData <ALARM_ID_...>();
     //      <ALARM_ID_...> is the enum from GuiAlarmID like ALARM_ID_HD_COMM_TIMEOUT
     static const AlarmStatusData ALARM_ID_HD_COMM_TIMEOUT();
-    static const AlarmStatusData ALARM_ID_UI_POST_FAILURE_SDCARD();
     static const AlarmStatusData ALARM_ID_NO_ALARM();
 
 };
Index: sources/gui/GuiController.cpp
===================================================================
diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -r90d21320e3fafd64ee2e9241ce4065aca86625ff
--- sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a)
+++ sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 90d21320e3fafd64ee2e9241ce4065aca86625ff)
@@ -288,10 +288,6 @@
 void GuiController::onSDCardStateChange(bool vIsReady, bool vIsReadOnly)
 {
     //DEBUG:0: qDebug() << " ***** GuiController " << Storage::SDCard_Base_Path_Name << vIsReady << vIsReadOnly << gDisableSDCFailLogStop;
-
-    //TODO : May probably need to send the following alarm in case the SD-Card fails after successful post and stop logging as well.
-    //         emit didActionTransmit(GuiActionType::ID_AlarmTriggered, {GuiAlarmID::ALARM_ID_UI_POST_FAILURE_SDCARD ,0,0,0,0,0,0,0});
-
     emit didSDCardStateChange(vIsReady, vIsReadOnly);
 }
 
Index: sources/gui/qml/compounds/TouchGrid.qml
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r90d21320e3fafd64ee2e9241ce4065aca86625ff
--- sources/gui/qml/compounds/TouchGrid.qml	(.../TouchGrid.qml)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/gui/qml/compounds/TouchGrid.qml	(.../TouchGrid.qml)	(revision 90d21320e3fafd64ee2e9241ce4065aca86625ff)
@@ -53,10 +53,27 @@
     property int colCount           : itemsText.length > rowCount ? Math.ceil(itemsText.length / rowCount) : 1
     readonly property int titleTopMargin: 110
 
+    readonly property alias itemsVisibleCount : _private.itemsVisibleCount
+
     signal itemClicked(int vIndex)
 
+    QtObject { id: _private
+        property int itemsVisibleCount : 0
+    }
+
+
     height: parent.height
 
+    onItemsVisibleChanged: {
+        let count = 0
+        for ( let itemVisible of itemsVisible ) {
+            if ( itemVisible ) {
+                count++
+            }
+        }
+        _private.itemsVisibleCount = count
+    }
+
     function undef(vValue, vOtherwise) {
         if ( vValue === undefined ) {
             return vOtherwise
@@ -72,7 +89,7 @@
         columns         : _root.colCount
         rows            : _root.rowCount
         rowSpacing      : 25
-        columnSpacing   : 100
+        columnSpacing   : itemsVisibleCount > rowCount ? 100 : 0
         Repeater {
             model       : _root.itemsText
             TouchRect { id: _touchItem