diff --git a/system/admin/editor/js/image.js b/system/admin/editor/js/image.js
new file mode 100644
index 0000000..24cd56a
--- /dev/null
+++ b/system/admin/editor/js/image.js
@@ -0,0 +1,66 @@
+(function () {
+
+	var converter = new Markdown.Converter();
+	var editor = new Markdown.Editor(converter);
+
+	var $dialog = $('#insertImageDialog').dialog({ 
+		autoOpen: false,
+		closeOnEscape: false,
+		open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
+	});
+
+	var $url = $('input[type=text]', $dialog);
+	var $file = $('input[type=file]', $dialog);
+
+	editor.hooks.set('insertImageDialog', function(callback) {
+
+		var dialogClose = function() {
+			$url.val('');
+			$file.val('');
+			$dialog.dialog('close');
+		};
+
+		$dialog.dialog({
+			buttons :  { 
+				"Insert" : {
+					text: "Insert",
+					id: "insert",
+					click: function(){
+						callback($url.val().length > 0 ? $url.val(): null);
+						dialogClose();
+					}   
+				},
+				"Cancel" : {
+					text: "Cancel",
+					id: "cancel",
+					click: function(){
+						dialogClose();
+						callback(null);
+					}   
+				}       
+			} 
+		});
+
+		var uploadComplete = function(response) {
+			if (response.error == '0') {
+				$url.val(base_path + response.path);
+				$("#insert").trigger('click');
+			} else {
+				alert(response.error);
+				$file.val('');
+			}
+		};
+
+		$file.ajaxfileupload({
+			'action': base_path + 'upload.php',
+			'onComplete': uploadComplete,
+		});
+
+		$dialog.dialog('open');
+
+		return true; // tell the editor that we'll take care of getting the image url
+	});
+
+	editor.run();
+
+})();
\ No newline at end of file
diff --git a/system/admin/views/add-audio.html.php b/system/admin/views/add-audio.html.php
index 734ec58..45f9772 100644
--- a/system/admin/views/add-audio.html.php
+++ b/system/admin/views/add-audio.html.php
@@ -65,64 +65,6 @@
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/add-image.html.php b/system/admin/views/add-image.html.php
index a09db1d..ad1aa37 100644
--- a/system/admin/views/add-image.html.php
+++ b/system/admin/views/add-image.html.php
@@ -65,64 +65,6 @@
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/add-link.html.php b/system/admin/views/add-link.html.php
index 0037bcb..1ad14b2 100644
--- a/system/admin/views/add-link.html.php
+++ b/system/admin/views/add-link.html.php
@@ -65,64 +65,6 @@
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index 5a3d396..046f549 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -52,64 +52,6 @@
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/add-post.html.php b/system/admin/views/add-post.html.php
index 3a8c0b5..0f3e741 100644
--- a/system/admin/views/add-post.html.php
+++ b/system/admin/views/add-post.html.php
@@ -58,64 +58,6 @@
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/add-quote.html.php b/system/admin/views/add-quote.html.php
index 33132e0..9cd842b 100644
--- a/system/admin/views/add-quote.html.php
+++ b/system/admin/views/add-quote.html.php
@@ -65,64 +65,6 @@
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/add-video.html.php b/system/admin/views/add-video.html.php
index 6808962..df7cd74 100644
--- a/system/admin/views/add-video.html.php
+++ b/system/admin/views/add-video.html.php
@@ -65,64 +65,6 @@
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-audio.html.php b/system/admin/views/edit-audio.html.php
index dc4edeb..24cf467 100644
--- a/system/admin/views/edit-audio.html.php
+++ b/system/admin/views/edit-audio.html.php
@@ -102,64 +102,6 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-image.html.php b/system/admin/views/edit-image.html.php
index 835f547..b0a7bcd 100644
--- a/system/admin/views/edit-image.html.php
+++ b/system/admin/views/edit-image.html.php
@@ -102,64 +102,6 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-        
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-link.html.php b/system/admin/views/edit-link.html.php
index 6f1633c..5de2820 100644
--- a/system/admin/views/edit-link.html.php
+++ b/system/admin/views/edit-link.html.php
@@ -102,64 +102,6 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index 3152b43..2b4df5e 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -81,64 +81,6 @@ else {
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-post.html.php b/system/admin/views/edit-post.html.php
index 8c835e3..ee2c98c 100644
--- a/system/admin/views/edit-post.html.php
+++ b/system/admin/views/edit-post.html.php
@@ -96,64 +96,6 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-profile.html.php b/system/admin/views/edit-profile.html.php
index 1eb02af..36624fe 100644
--- a/system/admin/views/edit-profile.html.php
+++ b/system/admin/views/edit-profile.html.php
@@ -60,64 +60,6 @@ if (file_exists($filename)) {
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-quote.html.php b/system/admin/views/edit-quote.html.php
index d570214..42e82bf 100644
--- a/system/admin/views/edit-quote.html.php
+++ b/system/admin/views/edit-quote.html.php
@@ -102,64 +102,6 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/admin/views/edit-video.html.php b/system/admin/views/edit-video.html.php
index d42a16f..c2eb4d5 100644
--- a/system/admin/views/edit-video.html.php
+++ b/system/admin/views/edit-video.html.php
@@ -102,64 +102,6 @@ $delete = site_url() . date('Y/m', $postdate) . '/' . $oldmd . '/delete?destinat
 </style>
 </div>
 <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-<script type="text/javascript">
-    (function () {
-        var converter = new Markdown.Converter();
-        var editor = new Markdown.Editor(converter);
-
-        var $dialog = $('#insertImageDialog').dialog({ 
-            autoOpen: false,
-            closeOnEscape: false,
-            open: function(event, ui) { $(".ui-dialog-titlebar-close").hide(); }
-        });
-
-        var $url = $('input[type=text]', $dialog);
-        var $file = $('input[type=file]', $dialog);
-        var base = '<?php echo site_url() ?>';
-
-        editor.hooks.set('insertImageDialog', function(callback) {
-
-            var dialogInsertClick = function() {                                      
-                callback($url.val().length > 0 ? $url.val(): null);
-                dialogClose();
-            };
-
-            var dialogCancelClick = function() {
-                dialogClose();
-                callback(null);
-            };
-
-            var dialogClose = function() {
-                $url.val('');
-                $file.val('');
-                $dialog.dialog('close');
-            };
-
-            $dialog.dialog( 'option', 'buttons', { 
-                'Insert': dialogInsertClick, 
-                'Cancel': dialogCancelClick 
-            });
-
-            var uploadComplete = function(response) {
-                if (response.error == '0') {
-                    $url.val(base + response.path);
-                } else {
-                    alert(response.error);
-                    $file.val('');
-                }
-            };
-
-            $file.ajaxfileupload({
-                'action': '<?php echo site_url() ?>upload.php',
-                'onComplete': uploadComplete,
-            });
-            
-            $dialog.dialog('open');
-
-            return true; // tell the editor that we'll take care of getting the image url
-        });
-
-        editor.run();
-
-    })();
-</script>
\ No newline at end of file
+<!-- Declare the base path. Important -->
+<script type="text/javascript">var base_path = '<?php echo site_url() ?>';</script>
+<script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/image.js"></script>
\ No newline at end of file
diff --git a/system/includes/functions.php b/system/includes/functions.php
index 6021d92..a775894 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1029,10 +1029,10 @@ function tab($p)
     $role = user('role', $user);
     if (isset($p->author)) {
         if ($user === $p->author || $role === 'admin') {
-            echo '<div class="tab" style="margin-bottom:30px;"><ul class="nav nav-tabs"><li role="presentation" class="active"><a href="' . $p->url . '">View</a></li><li><a href="' . $p->url . '/edit?destination=post">Edit</a></li></ul></div>';
+            echo '<div class="tab"><ul class="nav nav-tabs"><li role="presentation" class="active"><a href="' . $p->url . '">View</a></li><li><a href="' . $p->url . '/edit?destination=post">Edit</a></li></ul></div>';
         }
     } else {
-        echo '<div class="tab" style="margin-bottom:30px;><ul class="nav nav-tabs"><li role="presentation" class="active"><a href="' . $p->url . '">View</a><a href="' . $p->url . '/edit?destination=post">Edit</a></li></ul></div>';
+        echo '<div class="tab"><ul class="nav nav-tabs"><li role="presentation" class="active"><a href="' . $p->url . '">View</a><a href="' . $p->url . '/edit?destination=post">Edit</a></li></ul></div>';
     }
 }
 
diff --git a/themes/clean/css/style.css b/themes/clean/css/style.css
index b5739d2..bfd5bab 100644
--- a/themes/clean/css/style.css
+++ b/themes/clean/css/style.css
@@ -137,6 +137,17 @@ h6 {
     border-bottom: 1px solid #E4E7EE;
 }
 
+.tab ul {
+	padding:0;
+	margin:0;
+}
+
+.tab  li {
+    display: inline-block;
+	margin:0;
+	padding:0;
+}
+
 .tab a {
     background: #E4E7EE;
     border-radius: 6px 6px 0px 0;
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 05935c7..a554e0c 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -136,6 +136,17 @@ a:hover {
     border-bottom: 1px solid #E4E7EE;
 }
 
+.tab ul {
+	padding:0;
+	margin:0;
+}
+
+.tab  li {
+    display: inline-block;
+	margin:0;
+	padding:0;
+}
+
 .tab a {
     background: #E4E7EE;
     border-radius: 6px 6px 0px 0;
diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css
index 5f2d868..6699b3a 100644
--- a/themes/logs/css/style.css
+++ b/themes/logs/css/style.css
@@ -130,6 +130,17 @@ a:hover {
     border-bottom: 1px solid #E4E7EE;
 }
 
+.tab ul {
+	padding:0;
+	margin:0;
+}
+
+.tab  li {
+    display: inline-block;
+	margin:0;
+	padding:0;
+}
+
 .tab a {
     background: #E4E7EE;
     border-radius: 6px 6px 0px 0;