diff --git a/addons/Core/Core.inc b/addons/Core/Core.inc
index 385d63a..a9bb0ee 100644
--- a/addons/Core/Core.inc
+++ b/addons/Core/Core.inc
@@ -263,6 +263,7 @@ class ComicPressAddonCore extends ComicPressAddon {
     global $pagenow;
 
     $current_type = get_post_meta($post->ID, 'comic_image_type', true);
+    if (empty($current_type)) { $current_type = reset(array_keys($this->comic_image_types)); }
 
     $field_html_lines = array();
     $field_html_lines[] = '<input type="hidden" name="cp[_nonce]" value="' . wp_create_nonce('comicpress')  . '" />';
diff --git a/js/MediaUpload.js b/js/MediaUpload.js
new file mode 100644
index 0000000..1e2d1ce
--- /dev/null
+++ b/js/MediaUpload.js
@@ -0,0 +1,19 @@
+jQuery(function() {
+  jQuery('.media-item').each(function() {
+    var item = this;
+    jQuery('.savesend', item).each(function() {
+      jQuery(this).prepend(jQuery('<input type="submit" name="save" value="Save changes" />').addClass('button'));
+    });
+    
+    var show_insert = function(t) {
+      jQuery('input[name*=send]', item)[(t.value == 'none') ? 'show' : 'hide']();
+    };
+    
+    jQuery('input[name*=comic_image_type]', item).bind('click', function() { show_insert(this); });
+    var type = jQuery('input[name*=comic_image_type][checked]', item).get(0);
+    if (type) {
+      jQuery('.filename.new', item).append(jQuery('<strong />').text(' (' + jQuery.trim(jQuery(type).parent().text()) + ')'));
+      show_insert(type);
+    }
+  });
+});
\ No newline at end of file
diff --git a/js/MediaUploader.js b/js/MediaUploader.js
deleted file mode 100644
index 90ec0d8..0000000
--- a/js/MediaUploader.js
+++ /dev/null
@@ -1,12 +0,0 @@
-jQuery(function() {
-jQuery('.media-item').each(function() {
-	var item = this;
-	jQuery('.savesend', item).each(function() {
-		
-	});
-	jQuery('input[name*=comic_image_type]', item).bind('change', function() {
-		
-	});
-});
-
-});
\ No newline at end of file