diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
index a568db4..7135db6 100644
--- a/sources/awdebug.cpp
+++ b/sources/awdebug.cpp
@@ -35,7 +35,7 @@ QString AWDebug::getAboutText(const QString &_type)
     if (_type == "header") {
         text = NAME;
     } else if (_type == "version") {
-        text = i18np("Version %1 (build date %2)", VERSION, BUILD_DATE);
+        text = i18n("Version %1 (build date %2)", VERSION, BUILD_DATE);
         if (!QString(COMMIT_SHA).isEmpty())
             text += QString(" (%1)").arg(COMMIT_SHA);
     } else if (_type == "description") {
diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml
index 7f39ffe..15ec0de 100644
--- a/sources/awesome-widget/package/contents/ui/about.qml
+++ b/sources/awesome-widget/package/contents/ui/about.qml
@@ -30,6 +30,8 @@ Item {
     width: childrenRect.width
     height: childrenRect.height
 
+    property bool debug: awActions.isDebugEnabled()
+
     AboutTab {
         textProvider: awActions
     }
diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml
index 352cf42..fd6361a 100644
--- a/sources/desktop-panel/package/contents/ui/about.qml
+++ b/sources/desktop-panel/package/contents/ui/about.qml
@@ -30,6 +30,8 @@ Item {
     width: childrenRect.width
     height: childrenRect.height
 
+    property bool debug: awActions.isDebugEnabled()
+
     AboutTab {
         textProvider: dpAdds
     }
diff --git a/sources/qml/BugReport.qml b/sources/qml/BugReport.qml
index 1b76e6e..50b80d7 100644
--- a/sources/qml/BugReport.qml
+++ b/sources/qml/BugReport.qml
@@ -45,17 +45,14 @@ QtDialogs.Dialog {
 
         QtControls.TextField {
             id: title
-            anchors.left: parent.left
-            anchors.right: parent.right
+            QtLayouts.Layout.fillWidth: true
             placeholderText: i18n("Report subject")
         }
         QtLayouts.ColumnLayout {
-            anchors.left: parent.left
-            anchors.right: parent.right
+            QtLayouts.Layout.fillWidth: true
 
             QtControls.GroupBox {
-                anchors.left: parent.left
-                anchors.right: parent.right
+                QtLayouts.Layout.fillWidth: true
                 height: parent.height / 5
                 title: i18n("Description")
                 QtControls.TextArea {
@@ -65,8 +62,7 @@ QtDialogs.Dialog {
                 }
             }
             QtControls.GroupBox {
-                anchors.left: parent.left
-                anchors.right: parent.right
+                QtLayouts.Layout.fillWidth: true
                 height: parent.height / 5
                 title: i18n("Steps to reproduce")
                 QtControls.TextArea {
@@ -76,8 +72,7 @@ QtDialogs.Dialog {
                 }
             }
             QtControls.GroupBox {
-                anchors.left: parent.left
-                anchors.right: parent.right
+                QtLayouts.Layout.fillWidth: true
                 height: parent.height / 5
                 title: i18n("Expected result")
                 QtControls.TextArea {
@@ -87,15 +82,14 @@ QtDialogs.Dialog {
                 }
             }
             QtControls.GroupBox {
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
+                QtLayouts.Layout.fillWidth: true
+                QtLayouts.Layout.alignment: Qt.AlignBottom
                 title: i18n("Logs")
                 QtLayouts.ColumnLayout {
                     anchors.fill: parent
+                    QtLayouts.Layout.fillWidth: true
                     Row {
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                          QtLayouts.Layout.fillWidth: true
                         QtControls.Label {
                             width: parent.width * 2 / 5
                             horizontalAlignment: Text.AlignJustify
@@ -110,16 +104,14 @@ QtDialogs.Dialog {
                         }
                     }
                     QtControls.Button {
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                        QtLayouts.Layout.fillWidth: true
                         text: i18n("Load log file")
                         onClicked: logPath.open()
                     }
                     QtControls.TextArea {
                         id: logBody
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.bottom: parent.bottom
+                        QtLayouts.Layout.fillWidth: true
+                        QtLayouts.Layout.alignment: Qt.AlignBottom
                         textFormat: TextEdit.PlainText
                     }
                 }