diff --git a/plugins/LayerView/LayerView.qml b/plugins/LayerView/LayerView.qml
index 5971798f58..b6b9e9bf86 100755
--- a/plugins/LayerView/LayerView.qml
+++ b/plugins/LayerView/LayerView.qml
@@ -63,6 +63,8 @@ Item
             anchors.left: parent.left
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
             spacing: UM.Theme.getSize("layerview_row_spacing").height
+            anchors.right: parent.right
+            anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
 
             Label
             {
@@ -71,6 +73,8 @@ Item
                 text: catalog.i18nc("@label","View Mode: Layers")
                 font.bold: true
                 color: UM.Theme.getColor("text")
+                Layout.fillWidth: true
+                elide: Text.ElideMiddle;
             }
 
             Label
@@ -117,6 +121,8 @@ Item
                 model: layerViewTypes
                 visible: !UM.LayerView.compatibilityMode
                 style: UM.Theme.styles.combobox
+                anchors.right: parent.right
+                anchors.rightMargin: 10
 
                 onActivated:
                 {
@@ -176,17 +182,18 @@ Item
             Repeater {
                 model: Cura.ExtrudersModel{}
                 CheckBox {
+                    id: extrudersModelCheckBox
                     checked: view_settings.extruder_opacities[index] > 0.5 || view_settings.extruder_opacities[index] == undefined || view_settings.extruder_opacities[index] == ""
                     onClicked: {
                         view_settings.extruder_opacities[index] = checked ? 1.0 : 0.0
                         UM.Preferences.setValue("layerview/extruder_opacities", view_settings.extruder_opacities.join("|"));
                     }
-                    text: model.name
                     visible: !UM.LayerView.compatibilityMode
                     enabled: index + 1 <= 4
                     Rectangle {
                         anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
+                        anchors.right: extrudersModelCheckBox.right
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width
                         width: UM.Theme.getSize("layerview_legend_size").width
                         height: UM.Theme.getSize("layerview_legend_size").height
                         color: model.color
@@ -198,6 +205,17 @@ Item
                     Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
                     Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
                     style: UM.Theme.styles.checkbox
+                    Text
+                    {
+                        text: model.name
+                        elide: Text.ElideRight
+                        color: UM.Theme.getColor("text")
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.left: extrudersModelCheckBox.left;
+                        anchors.right: extrudersModelCheckBox.right;
+                        anchors.leftMargin: UM.Theme.getSize("checkbox").width + UM.Theme.getSize("default_margin").width /2
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
+                    }
                 }
             }
 
@@ -234,14 +252,15 @@ Item
                 }
 
                 CheckBox {
+                    id: legendModelCheckBox
                     checked: model.initialValue
                     onClicked: {
                         UM.Preferences.setValue(model.preference, checked);
                     }
-                    text: label
                     Rectangle {
                         anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
+                        anchors.right: legendModelCheckBox.right
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width
                         width: UM.Theme.getSize("layerview_legend_size").width
                         height: UM.Theme.getSize("layerview_legend_size").height
                         color: UM.Theme.getColor(model.colorId)
@@ -253,6 +272,17 @@ Item
                     Layout.preferredHeight: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
                     Layout.preferredWidth: UM.Theme.getSize("layerview_row").width
                     style: UM.Theme.styles.checkbox
+                    Text
+                    {
+                        text: label
+                        elide: Text.ElideRight
+                        color: UM.Theme.getColor("text")
+                        anchors.verticalCenter: parent.verticalCenter
+                        anchors.left: legendModelCheckBox.left;
+                        anchors.right: legendModelCheckBox.right;
+                        anchors.leftMargin: UM.Theme.getSize("checkbox").width + UM.Theme.getSize("default_margin").width /2
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width * 2
+                    }
                 }
             }
 
@@ -294,9 +324,11 @@ Item
                 Label {
                     text: label
                     visible: view_settings.show_legend
+                    id: typesLegenModelLabel
                     Rectangle {
                         anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
+                        anchors.right: typesLegenModelLabel.right
+                        anchors.rightMargin: UM.Theme.getSize("default_margin").width
                         width: UM.Theme.getSize("layerview_legend_size").width
                         height: UM.Theme.getSize("layerview_legend_size").height
                         color: UM.Theme.getColor(model.colorId)
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index c8febad85d..787bd899cf 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -416,6 +416,7 @@ Item
             text: catalog.i18nc("@label", "Build Plate Adhesion");
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
+            elide: Text.ElideRight
         }
 
         CheckBox