diff --git a/cms/css/editor.css b/cms/css/editor.css
index c5f1922..4bfaf6a 100644
--- a/cms/css/editor.css
+++ b/cms/css/editor.css
@@ -73,6 +73,7 @@ body {
 .blueButton:hover {
     background: linear-gradient(to bottom, #415989 5%, #2e466e 100%);
     background-color: #415989;
+    color: #ffffff;
 }
 
 .greenButton {
@@ -94,6 +95,7 @@ body {
 .greenButton:hover {
     background: linear-gradient(to bottom, #72b352 5%, #77b55a 100%);
     background-color: #72b352;
+    color: #ffffff;
 }
 
 .greenButton:active {
diff --git a/cms/js/cms.js b/cms/js/cms.js
index 0c0c4dd..8e1bad0 100644
--- a/cms/js/cms.js
+++ b/cms/js/cms.js
@@ -119,7 +119,7 @@ $(document).ready(function () {
                 } else {
                     showMessage("New page Created", "success");
                     $('#frameContainer').contents().get(0).location.href = response.url;
-                    $("#newPageForm").dialog("close"); // Close the modal on success
+                    $('.ui-dialog-content').dialog('close');
                 }
             },
             error: function () {
@@ -169,7 +169,7 @@ $(document).ready(function () {
                 // Add click event to list items to redirect
                 $("#fileList li").click(function () {
                     $('#frameContainer').contents().get(0).location.href = $(this).data("url"); // Redirect to the clicked file's URL
-                    $("#fileListDialog").dialog("close"); // Close the modal
+                    $('.ui-dialog-content').dialog('close');
                 });
             },
             error: function () {
@@ -186,7 +186,7 @@ $(document).ready(function () {
             width: 500,
             buttons: {
                 Close: function () {
-                    $(this).dialog("close");
+                    $('.ui-dialog-content').dialog('close');
                 }
             }
         });