diff --git a/static/templates/settings/organization-settings-admin.handlebars b/static/templates/settings/organization-settings-admin.handlebars
index a82265d91e..a44d5b87c9 100644
--- a/static/templates/settings/organization-settings-admin.handlebars
+++ b/static/templates/settings/organization-settings-admin.handlebars
@@ -12,107 +12,115 @@
         <div class="alert" id="admin-realm-message-editing-status"></div>
         <div class="alert" id="admin-realm-mandatory-topics-status"></div>
 
-        <h3>{{t "Message editing" }}</h3>
-        <div class="inline-block organization-permissions-parent">
-            <div class="input-group">
-                <label class="checkbox">
-                    <input type="checkbox" id="id_realm_allow_message_editing" name="realm_allow_message_editing"
-                           {{#if realm_allow_message_editing}}checked="checked"{{/if}} />
-                    <span></span>
-                </label>
-                <label for="id_realm_allow_message_editing" class="inline-block">
-                    {{t "Users can edit their messages" }}
-                </label>
+        <div id="org-msg-editing" class="org-subsection-parent">
+            <div class="subsection-header">
+                <h3>{{t "Message editing" }}</h3>
             </div>
+            <div class="inline-block organization-settings-parent">
+                <div class="input-group">
+                    <label class="checkbox">
+                        <input type="checkbox" id="id_realm_allow_message_editing" name="realm_allow_message_editing"
+                            {{#if realm_allow_message_editing}}checked="checked"{{/if}} />
+                        <span></span>
+                    </label>
+                    <label for="id_realm_allow_message_editing" class="inline-block">
+                        {{t "Users can edit their messages" }}
+                    </label>
+                </div>
 
-            <div class="input-group disableable {{#unless realm_allow_message_editing}}control-label-disabled{{/unless}}">
-                <label for="id_realm_message_content_edit_limit_minutes"
-                    id="id_realm_message_content_edit_limit_minutes_label">
-                    {{t 'Message edit limit in minutes (0 for no limit)' }}
-                </label>
-                <input type="text" id="id_realm_message_content_edit_limit_minutes"
-                       name="realm_message_content_edit_limit_minutes"
-                       class="admin-realm-message-content-edit-limit-minutes"
-                       value="{{ realm_message_content_edit_limit_minutes }}"
-                  {{#unless realm_allow_message_editing}}disabled="disabled"{{/unless}} />
-            </div>
+                <div class="input-group disableable {{#unless realm_allow_message_editing}}control-label-disabled{{/unless}}">
+                    <label for="id_realm_message_content_edit_limit_minutes"
+                        id="id_realm_message_content_edit_limit_minutes_label">
+                        {{t 'Message edit limit in minutes (0 for no limit)' }}
+                    </label>
+                    <input type="text" id="id_realm_message_content_edit_limit_minutes"
+                        name="realm_message_content_edit_limit_minutes"
+                        class="admin-realm-message-content-edit-limit-minutes"
+                        value="{{ realm_message_content_edit_limit_minutes }}"
+                    {{#unless realm_allow_message_editing}}disabled="disabled"{{/unless}} />
+                </div>
 
-            <div class="input-group">
-                <label class="checkbox">
-                    <input type="checkbox" id="id_realm_allow_message_deleting" name="realm_allow_message_deleting"
-                           {{#if realm_allow_message_deleting}}checked="checked"{{/if}} />
-                    <span></span>
-                </label>
-                <label for="id_realm_allow_message_deleting" id="id_realm_allow_message_deleting_label" class="inline-block">
-                    {{t "Users can delete their messages" }}
-                </label>
-                <i class="icon-vector-info-sign settings-info-icon realm_allow_message_deleting_tooltip" data-toggle="tooltip"
-                title="{{t 'Administrators can always delete any message.' }}"/>
-            </div>
+                <div class="input-group">
+                    <label class="checkbox">
+                        <input type="checkbox" id="id_realm_allow_message_deleting" name="realm_allow_message_deleting"
+                            {{#if realm_allow_message_deleting}}checked="checked"{{/if}} />
+                        <span></span>
+                    </label>
+                    <label for="id_realm_allow_message_deleting" id="id_realm_allow_message_deleting_label" class="inline-block">
+                        {{t "Users can delete their messages" }}
+                    </label>
+                    <i class="icon-vector-info-sign settings-info-icon realm_allow_message_deleting_tooltip" data-toggle="tooltip"
+                    title="{{t 'Administrators can always delete any message.' }}"/>
+                </div>
 
-            <div class="input-group">
-                <label class="checkbox">
-                    <input type="checkbox" id="id_realm_allow_edit_history" name="realm_allow_edit_history"
-                           {{#if realm_allow_edit_history}}checked="checked"{{/if}} />
-                    <span></span>
-                </label>
-                <label for="id_realm_allow_edit_history" id="id_realm_allow_edit_history_label" class="inline-block">
-                    {{t "Enable message edit history" }}
-                </label>
+                <div class="input-group">
+                    <label class="checkbox">
+                        <input type="checkbox" id="id_realm_allow_edit_history" name="realm_allow_edit_history"
+                            {{#if realm_allow_edit_history}}checked="checked"{{/if}} />
+                        <span></span>
+                    </label>
+                    <label for="id_realm_allow_edit_history" id="id_realm_allow_edit_history_label" class="inline-block">
+                        {{t "Enable message edit history" }}
+                    </label>
+                </div>
             </div>
         </div>
 
-        <h3>{{t "Message feed" }}</h3>
-        <div class="inline-block organization-permissions-parent">
-            {{#if false}}
-            <div class="input-group">
-                <label for="realm_message_retention_days"
-                    id="id_realm_message_retention_days_label">
-                    {{t 'Messages retention period in days (blank means messages are retained forever)' }}
-                </label>
-                <input type="text" id="id_realm_message_retention_days"
-                  name="realm_message_retention_days"
-                  class="admin-realm-message-retention-days"
-                  value="{{ realm_message_retention_days }}"/>
+        <div id="org-msg-feed" class="org-subsection-parent">
+            <div class="subsection-header">
+                <h3>{{t "Message feed" }}</h3>
             </div>
-            {{/if}}
+            <div class="inline-block organization-settings-parent">
+                {{#if false}}
+                <div class="input-group">
+                    <label for="realm_message_retention_days"
+                        id="id_realm_message_retention_days_label">
+                        {{t 'Messages retention period in days (blank means messages are retained forever)' }}
+                    </label>
+                    <input type="text" id="id_realm_message_retention_days"
+                    name="realm_message_retention_days"
+                    class="admin-realm-message-retention-days"
+                    value="{{ realm_message_retention_days }}"/>
+                </div>
+                {{/if}}
 
-            <div class="input-group">
-                <label class="checkbox">
-                    <input type="checkbox" id="id_realm_mandatory_topics" name="realm_mandatory_topics"
-                           {{#if realm_mandatory_topics}}checked="checked"{{/if}} />
-                    <span></span>
-                </label>
-                <label for="id_realm_mandatory_topics" id="id_realm_mandatory_topics_label" class="inline-block">
-                    {{t "Require topics in stream messages" }}
-                </label>
-            </div>
+                <div class="input-group">
+                    <label class="checkbox">
+                        <input type="checkbox" id="id_realm_mandatory_topics" name="realm_mandatory_topics"
+                            {{#if realm_mandatory_topics}}checked="checked"{{/if}} />
+                        <span></span>
+                    </label>
+                    <label for="id_realm_mandatory_topics" id="id_realm_mandatory_topics_label" class="inline-block">
+                        {{t "Require topics in stream messages" }}
+                    </label>
+                </div>
 
-            {{#if server_inline_image_preview}}
-            <div class="input-group">
-                <label class="checkbox">
-                    <input type="checkbox" id="id_realm_inline_image_preview" name="realm_inline_image_preview"
-                           {{#if realm_inline_image_preview}}checked="checked"{{/if}} />
-                    <span></span>
-                </label>
-                <label for="id_realm_inline_image_preview" id="id_realm_inline_image_preview_label" class="inline-block">
-                    {{t "Show previews of uploaded and linked images" }}
-                </label>
-            </div>
-            {{/if}}
+                {{#if server_inline_image_preview}}
+                <div class="input-group">
+                    <label class="checkbox">
+                        <input type="checkbox" id="id_realm_inline_image_preview" name="realm_inline_image_preview"
+                            {{#if realm_inline_image_preview}}checked="checked"{{/if}} />
+                        <span></span>
+                    </label>
+                    <label for="id_realm_inline_image_preview" id="id_realm_inline_image_preview_label" class="inline-block">
+                        {{t "Show previews of uploaded and linked images" }}
+                    </label>
+                </div>
+                {{/if}}
 
-            {{#if server_inline_url_embed_preview}}
-            <div class="input-group">
-                <label class="checkbox">
-                    <input type="checkbox" id="id_realm_inline_url_embed_preview" name="realm_inline_url_embed_preview"
-                           {{#if realm_inline_url_embed_preview}}checked="checked"{{/if}} />
-                    <span></span>
-                </label>
-                <label for="id_realm_inline_url_embed_preview" id="id_realm_inline_url_embed_preview_label" class="inline-block">
-                    {{t "Show previews of linked websites" }}
-                </label>
+                {{#if server_inline_url_embed_preview}}
+                <div class="input-group">
+                    <label class="checkbox">
+                        <input type="checkbox" id="id_realm_inline_url_embed_preview" name="realm_inline_url_embed_preview"
+                            {{#if realm_inline_url_embed_preview}}checked="checked"{{/if}} />
+                        <span></span>
+                    </label>
+                    <label for="id_realm_inline_url_embed_preview" id="id_realm_inline_url_embed_preview_label" class="inline-block">
+                        {{t "Show previews of linked websites" }}
+                    </label>
+                </div>
+                {{/if}}
             </div>
-            {{/if}}
         </div>
 
         {{#if is_admin }}
@@ -123,27 +131,31 @@
         </div>
         {{/if}}
 
-        <h3>{{t "Language &amp; notifications" }}</h3>
+        <div id="org-language-notify" class="org-subsection-parent">
+            <div class="subsection-header">
+                <h3>{{t "Language &amp; notifications" }}</h3>
+            </div>
+            <div class="inline-block organization-settings-parent">
+                <div class="input-group">
+                    <label for="realm_default_language" class="dropdown-title">{{t "Default language" }}:</label>
+                    <select name="realm_default_language" id="id_realm_default_language">
+                        {{#each language_list}}
+                        <option value='{{this.code}}'>{{this.name}}</option>
+                        {{/each}}
+                    </select>
+                </div>
+                <div class="input-group">
+                    <label class="checkbox">
+                        <input type="checkbox" id="id_realm_send_welcome_emails" name="realm_send_welcome_emails"
+                            {{#if realm_send_welcome_emails}}checked="checked"{{/if}} />
+                        <span></span>
+                    </label>
+                    <label for="id_realm_send_welcome_emails" id="id_realm_send_welcome_emails_label" class="inline-block">
+                        {{t "Send emails introducing Zulip to new users" }}
+                    </label>
+                </div>
+            </div>
 
-        <div class="inline-block organization-settings-parent">
-            <div class="input-group">
-                <label for="realm_default_language" class="dropdown-title">{{t "Default language" }}:</label>
-                <select name="realm_default_language" id="id_realm_default_language">
-                    {{#each language_list}}
-                    <option value='{{this.code}}'>{{this.name}}</option>
-                    {{/each}}
-                </select>
-            </div>
-            <div class="input-group">
-                <label class="checkbox">
-                    <input type="checkbox" id="id_realm_send_welcome_emails" name="realm_send_welcome_emails"
-                           {{#if realm_send_welcome_emails}}checked="checked"{{/if}} />
-                    <span></span>
-                </label>
-                <label for="id_realm_send_welcome_emails" id="id_realm_send_welcome_emails_label" class="inline-block">
-                    {{t "Send emails introducing Zulip to new users" }}
-                </label>
-            </div>
             {{#if is_admin }}
             <div class="input-group organization-submission">
                 <button class="button rounded sea-green save-language-org-settings">
@@ -151,58 +163,57 @@
                 </button>
             </div>
             {{/if}}
-        </div>
 
-        <div class="input-group">
-            <label for="realm_notifications_stream" id="realm_notifications_stream_label" class="inline-block"
-                title="{{t 'The stream to which new stream notifications go to.' }}">
-                {{t "New stream notifications:" }}
-                <span class="dropup actual-dropdown-menu" id="id_realm_notifications_stream"
-                    name="realm_notifications_stream" aria-labelledby="realm_notifications_stream_label">
-                    <button class="button small rounded dropdown-toggle" data-toggle="dropdown">
-                        <span id="realm_notifications_stream_name"></span>
-                        <i class="fa fa-pencil"></i>
-                    </button>
-                    <ul class="dropdown-menu modal-bg" role="menu">
-                        <li class="dropdown-search" role="presentation">
-                            <input type="text" role="menuitem" placeholder="{{t 'Filter streams' }}" autofocus/>
-                        </li>
-                        <span class="dropdown-list-body"></span>
-                    </ul>
-                </span>
-            </label>
-            {{#if is_admin }}
-            <a class="notifications-stream-disable">{{t "[Disable]" }}</a>
-            {{/if}}
-        </div>
-
-        <div class="input-group">
-            <label for="realm_signup_notifications_stream" id="realm_signup_notifications_stream_label" class="inline-block"
-                title="{{t 'The stream which new user signup notifications go to.' }}">
-                {{t "New user notifications:" }}
-                <span class="dropup actual-dropdown-menu" id="id_realm_signup_notifications_stream"
-                    name="realm_signup_notifications_stream" aria-labelledby="realm_signup_notifications_stream_label">
-                    <button class="button small rounded dropdown-toggle" data-toggle="dropdown" {{#unless new_user_bot_configured }} disabled="disabled" {{/unless}}>
-                        <span id="realm_signup_notifications_stream_name"></span>
-                        <i class="fa fa-pencil"></i>
-                    </button>
-                    <ul class="dropdown-menu modal-bg" role="menu">
-                        <li class="dropdown-search" role="presentation">
-                            <input type="text" role="menuitem" placeholder="{{t 'Filter streams' }}" autofocus/>
-                        </li>
-                        <span class="dropdown-list-body"></span>
-                    </ul>
-                </span>
-            </label>
-            {{#if is_admin }}
-                {{#if new_user_bot_configured }}
-                <a class="signup-notifications-stream-disable">{{t "[Disable]" }}</a>
+            <div class="input-group">
+                <label for="realm_notifications_stream" id="realm_notifications_stream_label" class="inline-block"
+                    title="{{t 'The stream to which new stream notifications go to.' }}">
+                    {{t "New stream notifications:" }}
+                    <span class="dropup actual-dropdown-menu" id="id_realm_notifications_stream"
+                        name="realm_notifications_stream" aria-labelledby="realm_notifications_stream_label">
+                        <button class="button small rounded dropdown-toggle" data-toggle="dropdown">
+                            <span id="realm_notifications_stream_name"></span>
+                            <i class="fa fa-pencil"></i>
+                        </button>
+                        <ul class="dropdown-menu modal-bg" role="menu">
+                            <li class="dropdown-search" role="presentation">
+                                <input type="text" role="menuitem" placeholder="{{t 'Filter streams' }}" autofocus/>
+                            </li>
+                            <span class="dropdown-list-body"></span>
+                        </ul>
+                    </span>
+                </label>
+                {{#if is_admin }}
+                <a class="notifications-stream-disable">{{t "[Disable]" }}</a>
                 {{/if}}
-            {{/if}}
-            <i class="icon-vector-question-sign signup_notification_stream_tooltip" data-toggle="tooltip"
-                {{#if new_user_bot_configured}}style="display:none" {{/if}}
-                title="{{t 'You must configure a "new user" bot before setting a stream for signup notifications.' }}"/>
-        </div>
+            </div>
 
+            <div class="input-group">
+                <label for="realm_signup_notifications_stream" id="realm_signup_notifications_stream_label" class="inline-block"
+                    title="{{t 'The stream which new user signup notifications go to.' }}">
+                    {{t "New user notifications:" }}
+                    <span class="dropup actual-dropdown-menu" id="id_realm_signup_notifications_stream"
+                        name="realm_signup_notifications_stream" aria-labelledby="realm_signup_notifications_stream_label">
+                        <button class="button small rounded dropdown-toggle" data-toggle="dropdown" {{#unless new_user_bot_configured }} disabled="disabled" {{/unless}}>
+                            <span id="realm_signup_notifications_stream_name"></span>
+                            <i class="fa fa-pencil"></i>
+                        </button>
+                        <ul class="dropdown-menu modal-bg" role="menu">
+                            <li class="dropdown-search" role="presentation">
+                                <input type="text" role="menuitem" placeholder="{{t 'Filter streams' }}" autofocus/>
+                            </li>
+                            <span class="dropdown-list-body"></span>
+                        </ul>
+                    </span>
+                </label>
+                {{#if is_admin }}
+                    {{#if new_user_bot_configured }}
+                    <a class="signup-notifications-stream-disable">{{t "[Disable]" }}</a>
+                    {{/if}}
+                {{/if}}
+                <i class="icon-vector-question-sign signup_notification_stream_tooltip" data-toggle="tooltip"
+                    {{#if new_user_bot_configured}}style="display:none" {{/if}}
+                    title="{{t 'You must configure a "new user" bot before setting a stream for signup notifications.' }}"/>
+            </div>
+        </div>
     </form>
 </div>