diff --git a/templates/2k11/admin/entries.tpl b/templates/2k11/admin/entries.tpl
index cd2f2981..5f64e599 100644
--- a/templates/2k11/admin/entries.tpl
+++ b/templates/2k11/admin/entries.tpl
@@ -75,36 +75,36 @@
         <textarea id="serendipity[extended]" name="serendipity[extended]" rows="15">{$entry_vars.entry.extended|@escape}</textarea>
     </div>
 
-    <div id="edit_entry_submit" class="clearfix">
-        <div>
-            <div id="edit_entry_status" class="form_select">
-                <label for="entry_status">Entry status</label> {* i18n *}
-                <select id="entry_status" name="serendipity[isdraft]">
-                {if $entry_vars.serendipityRightPublish}
-                    <option value="false"{if $entry_vars.draft_mode == 'publish'} selected{/if}>{$CONST.PUBLISH}</option>
-                {/if}
-                    <option value="true"{if $entry_vars.draft_mode == 'draft'} selected{/if}>{$CONST.DRAFT}</option>
-                </select>
+    <div class="clearfix">
+        <div id="edit_entry_status_comments" class="clearfix">
+            <div class="form_check">
+                <input id="checkbox_allow_comments" name="serendipity[allow_comments]" type="checkbox" value="true"{if $entry_vars.allow_comments} checked="checked"{/if}><label for="checkbox_allow_comments">{$CONST.COMMENTS_ENABLE}</label>
             </div>
 
-            <div class="form_buttons">
-                <input class="entry_preview" type="submit" value="{$CONST.PREVIEW}">
-                <input type="submit" value="{$CONST.SAVE}">
+            <div class="form_check">
+                <input id="checkbox_moderate_comments" name="serendipity[moderate_comments]" type="checkbox" value="true"{if $entry_vars.moderate_comments} checked="checked"{/if}><label for="checkbox_moderate_comments">{$CONST.COMMENTS_MODERATE}</label>
+            </div>
+        </div>
+
+        <div id="edit_entry_submit" class="clearfix">
+            <div>
+                <div id="edit_entry_status" class="form_select">
+                    <label for="entry_status">Entry status</label> {* i18n *}
+                    <select id="entry_status" name="serendipity[isdraft]">
+                    {if $entry_vars.serendipityRightPublish}
+                        <option value="false"{if $entry_vars.draft_mode == 'publish'} selected{/if}>{$CONST.PUBLISH}</option>
+                    {/if}
+                        <option value="true"{if $entry_vars.draft_mode == 'draft'} selected{/if}>{$CONST.DRAFT}</option>
+                    </select>
+                </div>
+
+                <div class="form_buttons">
+                    <input class="entry_preview" type="submit" value="{$CONST.PREVIEW}">
+                    <input type="submit" value="{$CONST.SAVE}">
+                </div>
             </div>
         </div>
     </div>
-
-    <div id="edit_entry_status_comments" class="clearfix">
-        <div class="form_check">
-            <input id="checkbox_allow_comments" name="serendipity[allow_comments]" type="checkbox" value="true"{if $entry_vars.allow_comments} checked="checked"{/if}><label for="checkbox_allow_comments">{$CONST.COMMENTS_ENABLE}</label>
-        </div>
-
-        <div class="form_check">
-            <input id="checkbox_moderate_comments" name="serendipity[moderate_comments]" type="checkbox" value="true"{if $entry_vars.moderate_comments} checked="checked"{/if}><label for="checkbox_moderate_comments">{$CONST.COMMENTS_MODERATE}</label>
-        </div>
-    </div>
-
-    
     
     {capture name='advanced_options'}{$entry_vars.entry|@serendipity_refhookPlugin:'backend_display'}{/capture}
     {if ! empty($smarty.capture.advanced_options) }
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index effde5e2..a74a8b68 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1359,7 +1359,8 @@ fieldset p,
 #login .form_buttons,
 .media_file .actions,
 #entries_list .actions,
-.msg_hint > p:last-of-type {
+.msg_hint > p:last-of-type,
+#edit_entry_submit .form_buttons {
     margin-bottom: 0;
 }
 
@@ -1374,10 +1375,6 @@ fieldset p,
     margin-top: 1em;
 }
 
-#advanced_options {
-    margin-top: 2em;
-}
-
 #advanced_options > legend > span {
     display: inline-block;
     font-size: 1.28571em;
@@ -2604,10 +2601,28 @@ img.mfp-img {
         width: 48%;
     }
 
+    #edit_entry_status_comments {
+        float: left;
+        width: 70%;
+    }
+
+    #edit_entry_submit {
+        float: right;
+        width: 30%;
+    }
+
+    #edit_entry_submit label {
+        display: block;
+    }
+
     .js #serendipity_category .form_field #category_icon {
         width: 85%;
     }
 
+    #entry_status {
+        width: 100%;
+    }
+
     .serendipity_statistics > .wide_box {
         clear: left;
         float: none;
@@ -2718,6 +2733,10 @@ img.mfp-img {
         width: 100%;
     }
 
+    #edit_entry_status_comments .form_check {
+        margin-bottom: 0;
+    }
+
     #media_pane_sort div fieldset input,
     #media_pane_sort div fieldset select,
     #media_pane_filter div fieldset input,
@@ -2876,18 +2895,6 @@ img.mfp-img {
         margin: 0 0 0 2%;
     }
 
-    #edit_entry_submit {
-        float: right;
-    }
-
-    #edit_entry_submit > div {
-        float: right;
-    }
-
-    #entry_status {
-        width: 100%;
-    }
-
     #preview {
         float: left;
         margin-bottom: 2.25em;
@@ -2925,11 +2932,6 @@ img.mfp-img {
     .js #edit_entry_metadata select {
         width: 91%;
     }
-
-    #edit_entry_status_comments .form_check {
-        float: left;
-        margin: .75em 1em .75em 0;
-    }
 }