diff --git a/common/css/default.css b/common/css/default.css
index 540886551..d6c66c67a 100644
--- a/common/css/default.css
+++ b/common/css/default.css
@@ -21,13 +21,13 @@ a.bold {
 .folder_area { display: none; }
 
 .editor_component_output {
-  background:url(../tpl/images/multimedia_icon.gif) no-repeat center;
+  background:url(../tpl/images/edit_component.gif) no-repeat center;
   background-color:#FFFFFF;
   border:3px dotted #2661db;
 }
 
 .zbxe_plugin_output {
-  background:url(../tpl/images/multimedia_icon.gif) no-repeat center;
+  background:url(../tpl/images/plugin.gif) no-repeat center;
   background-color:#FFFFFF;
   border:3px dotted #039311;
 }
diff --git a/common/tpl/images/edit_component.gif b/common/tpl/images/edit_component.gif
new file mode 100644
index 000000000..755063f95
Binary files /dev/null and b/common/tpl/images/edit_component.gif differ
diff --git a/common/tpl/images/multimedia_icon.gif b/common/tpl/images/multimedia_icon.gif
deleted file mode 100644
index d5309d362..000000000
Binary files a/common/tpl/images/multimedia_icon.gif and /dev/null differ
diff --git a/common/tpl/images/plugin.gif b/common/tpl/images/plugin.gif
new file mode 100644
index 000000000..3987b826e
Binary files /dev/null and b/common/tpl/images/plugin.gif differ
diff --git a/modules/editor/components/table_maker/tpl/popup.css b/modules/editor/components/table_maker/tpl/popup.css
index b1a02dd52..44d8c42c1 100644
--- a/modules/editor/components/table_maker/tpl/popup.css
+++ b/modules/editor/components/table_maker/tpl/popup.css
@@ -1,5 +1,5 @@
 .editor_window {
-  width:680px;
+  width:530px;
   text-align:center;
 }
 
@@ -17,9 +17,10 @@
 }
 
 .editor_option {
-  width:620px;
-  height:30px;
-  text-align:left;
+  text-align:center;
+  padding:5px 0px 5px 0px;
+  background-color:#EEEEEE;
+  margin-bottom:5px;
 }
 
 .item_area {
@@ -27,27 +28,30 @@
 }
 
 .header {
-  width:80px;
+  width:85px;
   float:left;
   text-align:right;
   font-weight:bold;
   margin:5px;
   font-size:9pt;
+  overflow:hidden;
 }
 
 .body {
-  width:120px;
+  overflow:hidden;
+  width:140px;
   float:left;
   text-align:left;
-  margin:5px 10px 5px 5px;
+  margin:5px 5px 5px 0px;
   font-size:9pt;
 }
 
 .wide_body {
   width:380px;
   float:left;
+  clear:right;
   text-align:left;
-  margin:5px 10px 5px 5px;
+  margin:5px 10px 5px 0px;
   font-size:9pt;
 }
 .table_input {
diff --git a/modules/editor/components/table_maker/tpl/popup.html b/modules/editor/components/table_maker/tpl/popup.html
index 8ac2f7b86..8970f1fcc 100644
--- a/modules/editor/components/table_maker/tpl/popup.html
+++ b/modules/editor/components/table_maker/tpl/popup.html
@@ -24,12 +24,13 @@
 
     <div class="item_area">
       <div class="header">{$lang->table_width} :</div>
-      <div class="body">
+      <div class="wide_body">
         <input type="text" class="table_input" id="width" value="100" />
         <input type="radio" name="width_unit" id="width_unit_percent" checked="true" /><label for="width_unit_percent">%</label>
         <input type="radio" name="width_unit" id="width_unit_pixel" /><label for="width_unit_pixel">px</label>
       </div>
-
+    </div>
+    <div class="item_area">
       <div class="header">{$lang->table_cellspacing} :</div>
       <div class="body"><input type="text" class="table_input" id="cellspacing" value="0" />px</div>
 
@@ -63,7 +64,7 @@
 
     <div class="item_area" id="border_color_area" style="display:none">
       <div class="header">{$lang->table_border_color} :</div>
-      <div class="body">
+      <div class="wide_body">
         <div class="editor_color_box">
           <script type="text/javascript">
           printColor("border", "{$tpl_path}/images/blank.gif");
@@ -83,7 +84,7 @@
 
     <div class="item_area" id="bg_color_area" style="display:none">
       <div class="header">{$lang->table_bg_color} :</div>
-      <div class="body">
+      <div class="wide_body">
         <div class="editor_color_box">
           <script type="text/javascript">
           printColor("bg", "{$tpl_path}/images/blank.gif");
diff --git a/modules/plugin/tpl.admin/js/admin.js b/modules/plugin/tpl.admin/js/admin.js
index dee27121b..7340a40c6 100644
--- a/modules/plugin/tpl.admin/js/admin.js
+++ b/modules/plugin/tpl.admin/js/admin.js
@@ -20,6 +20,8 @@ function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
     var iframe_obj = opener.editorGetIFrame(module_srl);
     opener.editorReplaceHTML(iframe_obj, plugin_code);
     opener.editorFocus(module_srl);
+
+    window.close();
 } 
 
 /* 플러그인 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */
diff --git a/plugins/login_info/skins/default/normal/style.css b/plugins/login_info/skins/default/normal/style.css
index 71b828013..493043c79 100644
--- a/plugins/login_info/skins/default/normal/style.css
+++ b/plugins/login_info/skins/default/normal/style.css
@@ -94,6 +94,7 @@
 .login_info_default_normal .button_area {
     clear:both;
     height:20px;
+    margin-top:5px;
     text-align:center;
 }