diff --git a/package/Changelog b/package/Changelog
index 2e5f87f48aeb90b01ca698d5c6dbe68faec86ef2..e32ca55e3da8f6e9cdb8a610144e8f35a388d279 100644
--- a/package/Changelog
+++ b/package/Changelog
@@ -1,5 +1,7 @@
 version 2.1-beta3 (2017-07-02)
 - get localisation working, added missing translations to fr locale.
+- added russian translation (it's not very good)
+- LunaWidget stretches to fit, not fixed size anymore
 version 2.1-beta2 (2017-06-29)
 - pick lunar image from a list
 - current image shown with callibration grid on config page (Tycho & Copernicus marked)
diff --git a/package/README b/package/README
index b544cdeee9557c2dc6af99ff544466eb7b305441..1753de4d61ecba88d87ab2dd9fc60b2524cbe553 100644
--- a/package/README
+++ b/package/README
@@ -119,10 +119,3 @@ Since the average lunation duration is used, this bug will only occasionaly
 appear, if it appears at all.  This can be solved by setting the variable
 lunationDuration to a higher value (with the negative impact that the startup
 of the plasmoid may be slower).
-
-Known limitations
------------------
-
-- The "Long" date format does not display properly if a shorter date format
-  has already been displayed - the dialog does not change width after it
-  has been displayed. Restart sorts it out.
diff --git a/package/contents/ui/LunaWidget.qml b/package/contents/ui/LunaWidget.qml
index 51f653da1016693c68c57e15f5335cd196aa3d19..4a2795596716fa41190769662f829df3bce742f5 100644
--- a/package/contents/ui/LunaWidget.qml
+++ b/package/contents/ui/LunaWidget.qml
@@ -20,6 +20,7 @@
 */
 
 import QtQuick 2.1
+import QtQuick.Layouts 1.2 as QtLayouts
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.plasmoid 2.0
 
@@ -36,8 +37,8 @@ Item {
     property var dateFormatQt: 0
     property string dateFormatString: "hh"
 
-    width: labelButtonColumn.width + 20
-    height: labelButtonColumn.height + 20
+    QtLayouts.Layout.minimumWidth: labelButtonColumn.width
+    QtLayouts.Layout.minimumHeight: labelButtonColumn.height
 
     Component.onCompleted: {
         setDateFormat();
@@ -101,9 +102,7 @@ Item {
     Column {
         id: labelButtonColumn
 
-        anchors.top: lunaWidget.top
-        anchors.topMargin: 10
-        anchors.horizontalCenter: lunaWidget.horizontalCenter
+        anchors.centerIn: parent
 
         spacing: 10
 
diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
index 68eee53b76fe4217b9ec0c1c27b7043431a8ba4a..46a60c9c13acbb4bdea084135230178388d87097 100644
--- a/package/contents/ui/main.qml
+++ b/package/contents/ui/main.qml
@@ -108,21 +108,8 @@ Item {
     Plasmoid.fullRepresentation: Item {
         id: full
 
-        property alias lw_width: lunaWidget.width
-        property alias lw_height: lunaWidget.height
-
-        /* I cannot figure out ANY way to change the size of this
-         * object AFTER it has been created. The lw_width value
-         * DOES get changed, it just has no effect on setting this
-         * width value.
-         *
-         * I would settle for making this a type that adjusts its
-         * size to enclose its content - and as far as I can see,
-         * it can't do it either. The size it appears at is the
-         * size it keeps.
-         */
-        width: 300 //lw_width + 20
-        height: lw_height + 20
+        QtLayouts.Layout.preferredWidth: lunaWidget.QtLayouts.Layout.minimumWidth
+        QtLayouts.Layout.preferredHeight: lunaWidget.QtLayouts.Layout.minimumHeight
 
         property int dateFormat: main.dateFormat
         property string dateFormatString: main.dateFormatString