diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
index 78df6943..52bc88e9 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/CreateWallpaperWizard.qml
@@ -205,7 +205,7 @@ Item {
                 state: "diabledPage0"
                 onClicked: {
 
-                    if (!page_0.canNext && !page_0.gifCreated )
+                    if (!page_0.canNext || !page_0.gifCreated )
                         return
 
                     if (view.currentIndex < view.count - 1)
diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml
index 95327c8c..a0c09097 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/NextButton.qml
@@ -48,15 +48,16 @@ Button {
             }
         }
     ]
-    transitions: [
-        Transition {
-            from: "*"
-            to: "*"
-            NumberAnimation {
-                property: "width"
-                easing.type: Easing.InOutQuad
-                duration: 2000
-            }
-        }
-    ]
+// TODO find  a way to smoothly change with on text change
+//    transitions: [
+//        Transition {
+//            from: "*"
+//            to: "*"
+//            NumberAnimation {
+//                property: "width"
+//                easing.type: Easing.InOutQuad
+//                duration: 2000
+//            }
+//        }
+//    ]
 }
diff --git a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/Page_0.qml b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/Page_0.qml
index 50292b76..bcb295d9 100644
--- a/ScreenPlay/qml/Create/Wizards/CreateWallpaper/Page_0.qml
+++ b/ScreenPlay/qml/Create/Wizards/CreateWallpaper/Page_0.qml
@@ -56,9 +56,9 @@ Rectangle {
             }
 
             Text {
-                id: text1
+                id: txtConvert
                 color: "white"
-                text: qsTr("Generating preview...")
+                text: qsTr("Generating preview video...")
                 font.pixelSize: 14
                 anchors {
                     horizontalCenter: parent.horizontalCenter
@@ -71,6 +71,10 @@ Rectangle {
                 target: screenPlayCreate
 
                 onCreateWallpaperStateChanged: {
+                    if (state === Create.State.ConvertingPreviewGif) {
+                        txtConvert.text = qsTr("Generating preview gif...")
+                    }
+
                     if (state === Create.State.ConvertingPreviewGifFinished) {
                         imgPreview.source = "file:///"
                                 + screenPlayCreate.workingDir + "/preview.gif"