diff --git a/OmobiDisplayApp/OmobiDisplayApp.pro b/OmobiDisplayApp/OmobiDisplayApp.pro
index a3e28c9..3e7d5a9 100644
--- a/OmobiDisplayApp/OmobiDisplayApp.pro
+++ b/OmobiDisplayApp/OmobiDisplayApp.pro
@@ -45,3 +45,5 @@ contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
     ANDROID_ABIS = \
         armeabi-v7a
 }
+
+ANDROID_ABIS = armeabi-v7a
diff --git a/OmobiDisplayApp/ressources/qml/Chip.qml b/OmobiDisplayApp/ressources/qml/Chip.qml
index 3db1ea6..cff4dc3 100644
--- a/OmobiDisplayApp/ressources/qml/Chip.qml
+++ b/OmobiDisplayApp/ressources/qml/Chip.qml
@@ -8,7 +8,7 @@ Item {
     property bool raised: false
     property alias mouseArea: mouseArea
     property string text: ""
-    property string color: "#fcba03"
+    property string color: ""
     property bool isDarkColor: control.checkIsDarkColor(color)
     property double glowRadius: 0.001
     property double glowSpread: 0.2
@@ -57,8 +57,10 @@ Item {
 
     Text {
         id: contentText
-        anchors.fill: parent
-        anchors.margins: parent.height * 0.25
+        anchors.centerIn: background
+
+        width: background.width * 0.5
+        height: background.height * 0.7
 
         font.pixelSize: height
         fontSizeMode: Text.Fit
diff --git a/OmobiDisplayApp/ressources/qml/ColorPickerDelegate.qml b/OmobiDisplayApp/ressources/qml/ColorPickerDelegate.qml
index 28a93da..a5f799e 100644
--- a/OmobiDisplayApp/ressources/qml/ColorPickerDelegate.qml
+++ b/OmobiDisplayApp/ressources/qml/ColorPickerDelegate.qml
@@ -8,6 +8,9 @@ ItemDelegate {
     property string value: ""
 
     onClicked: {
+        if(value === "")
+            colorPicker.value = "#FFFFFF"
+        else
         colorPicker.value = value
         textEditDialog.open()
     }
@@ -22,9 +25,13 @@ ItemDelegate {
         width: parent.width * 0.15
         height: parent.height * 0.6
 
-        color: control.value === "" ? "transparent":control.value
+        color: control.value === "" ? "#FFFFFF":control.value
 
         text: value === "" ? "Not set": value
+
+        onClicked: {
+            control.clicked()
+        }
     }
 
     Text {
diff --git a/OmobiDisplayApp/ressources/qml/DisplayTextDelegate.qml b/OmobiDisplayApp/ressources/qml/DisplayTextDelegate.qml
index c059cd8..eed5feb 100644
--- a/OmobiDisplayApp/ressources/qml/DisplayTextDelegate.qml
+++ b/OmobiDisplayApp/ressources/qml/DisplayTextDelegate.qml
@@ -44,7 +44,7 @@ ItemDelegate {
 
         Chip {
             Layout.fillHeight: true
-            Layout.preferredWidth: model.scroll ? parent.width * 0.15 : 0
+            Layout.preferredWidth: model.scroll ? control.width * 0.15 : 0
 
             visible: model.scroll
 
@@ -57,20 +57,28 @@ ItemDelegate {
             }
 
             text: model.scroll ? qsTr("scrolling"):qsTr("false")
+
+            onClicked: {
+                control.clicked()
+            }
         }
 
         Chip {
             Layout.fillHeight: true
-            Layout.preferredWidth: parent.width * 0.1
+            Layout.preferredWidth: height
 
             opacity: model.active ? 1:0.5
 
             color: model.color
+
+            onClicked: {
+                control.clicked()
+            }
         }
 
         Chip {
-            Layout.preferredHeight: parent.height
-            Layout.preferredWidth: parent.width * 0.15
+            Layout.fillHeight: true
+            Layout.preferredWidth: control.width * 0.15
 
             color: model.active ? "#4CAF50" : "#F44336"