diff --git a/e107_admin/image.php b/e107_admin/image.php
index 9c9e2ae93..b1636224b 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1731,7 +1731,7 @@ class media_admin_ui extends e_admin_ui
 			<button id='etrigger-submit' type='submit' class='btn btn-success submit e-dialog-save e-dialog-close' data-bbcode='".$options['bbcode']."' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it'  >
 			<span>".LAN_SAVE."</span>
 			</button>
-			<button type='submit' class=' btn btn-default btn-secondary submit e-dialog-close' name='cancel_image' value='Cancel'  data-close='true'>
+			<button type='submit' class=' btn btn-default btn-secondary submit e-dialog-close e-dialog-cancel' name='cancel_image' value='Cancel'  data-close='true'>
 			<span>".LAN_CANCEL."</span>
 			</button>
 			</div>";
@@ -2439,14 +2439,15 @@ class media_admin_ui extends e_admin_ui
 			}
 		}
 	}
-			
-		
-	
-	
-	
 
+
+	/**
+	 * @deprecated by $prefs.
+	 * @return bool|void
+	 */
 	function settingsPage()
 	{
+		return false;
 		global $pref;
 
 		$frm = e107::getForm();
diff --git a/e107_plugins/tinymce4/e_footer.php b/e107_plugins/tinymce4/e_footer.php
index 7fe1c2179..fd8f52207 100644
--- a/e107_plugins/tinymce4/e_footer.php
+++ b/e107_plugins/tinymce4/e_footer.php
@@ -170,9 +170,9 @@ if((e107::wysiwyg(null, true) === 'tinymce4' && check_class($pref['post_html']))
 
 			});
 
-			$('.e-dialog-close').click(function(){
+			$('.e-dialog-cancel').click(function(){
 
-				// top.tinymce.activeEditor.windowManager.close();
+				top.tinymce.activeEditor.windowManager.close();
 
 			});
 
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index cf44f8f47..7a120e2fa 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -216,12 +216,13 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
 		if (path == '') return;
 
 		// Only Do width/height styling on bbcodes --
-		if(width != '' && width !== undefined)
+		if(width != '' && width != 0 && width !== undefined)
 		{
+			console.log('Width: '+ width);
 			style = style + 'width:' + width + 'px;';
 		}
 
-		if(height != '' && height !== undefined)
+		if(height != '' && height != 0 && height !== undefined)
 		{
 			style = style + 'height:' + height + 'px;';
 		}