diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 07751ee4da..808e703b52 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -482,7 +482,7 @@ module.exports = React.createClass({
             remote_aliases_section = 
                 <div>
                     <div className="mx_RoomSettings_aliasLabel">
-                        This room can be found elsewhere as:
+                        Remote addresses for this room:
                     </div>
                     <div className="mx_RoomSettings_aliasesTable">
                         { remote_domains.map(function(state_key, i) {
@@ -513,7 +513,7 @@ module.exports = React.createClass({
                             return <option value={ alias } key={ i + "_" + j }>{ alias }</option>
                         });
                     })}
-                    <option value="" key="unset">not set</option>
+                    <option value="" key="unset">not specified</option>
                 </select>
         }
         else {
@@ -522,11 +522,12 @@ module.exports = React.createClass({
 
         var aliases_section =
             <div>
-                <h3>Directory</h3>
+                <h3>Addresses</h3>
+                <div className="mx_RoomSettings_aliasLabel">The main address for this room is: { canonical_alias_section }</div>
                 <div className="mx_RoomSettings_aliasLabel">
                     { this.state.aliases[domain].length
-                      ? "This room can be found on " + domain + " as:"
-                      : "This room is not findable on " + domain }
+                      ? "Local addresses for this room:"
+                      : "This room has no local addresses" }
                 </div>
                 <div className="mx_RoomSettings_aliasesTable">
                     { this.state.aliases[domain].map(function(alias, i) {
@@ -539,7 +540,7 @@ module.exports = React.createClass({
                                 <EditableText
                                     className="mx_RoomSettings_alias mx_RoomSettings_editable"
                                     placeholderClassName="mx_RoomSettings_aliasPlaceholder"
-                                    placeholder={ "New alias (e.g. #foo:" + domain + ")" }
+                                    placeholder={ "New address (e.g. #foo:" + domain + ")" }
                                     blurToCancel={ false }
                                     onValueChanged={ self.onAliasChanged.bind(self, domain, i) }
                                     editable={ can_set_room_aliases }
@@ -567,7 +568,6 @@ module.exports = React.createClass({
 
                 { remote_aliases_section }
 
-                <div className="mx_RoomSettings_aliasLabel">The official way to refer to this room is: { canonical_alias_section }</div>
             </div>;
 
         var room_colors_section =
@@ -676,23 +676,23 @@ module.exports = React.createClass({
         // FIXME: disable guests_read if the user hasn't turned on shared history
         return (
             <div className="mx_RoomSettings">
-                <label><input type="checkbox" ref="is_private" defaultChecked={join_rule != "public"}/> Make this room private</label> <br/>
-                <label><input type="checkbox" ref="share_history" defaultChecked={history_visibility === "shared" || history_visibility === "world_readable"}/> Share message history with new participants</label> <br/>
-                <label><input type="checkbox" ref="guests_join" defaultChecked={guest_access === "can_join"}/> Let guests join this room</label> <br/>
-                <label><input type="checkbox" ref="guests_read" defaultChecked={history_visibility === "world_readable"}/> Let users read message history without joining</label> <br/>
-                <label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label>
 
                 { tags_section }
 
+                <div className="mx_RoomSettings_toggles">
+                    <label><input type="checkbox" ref="are_notifications_muted" defaultChecked={are_notifications_muted}/> Mute notifications for this room</label>
+                    <label><input type="checkbox" ref="is_private" defaultChecked={join_rule != "public"}/> Make this room private</label>
+                    <label><input type="checkbox" ref="share_history" defaultChecked={history_visibility === "shared" || history_visibility === "world_readable"}/> Share message history with new participants</label>
+                    <label><input type="checkbox" ref="guests_join" defaultChecked={guest_access === "can_join"}/> Let guests join this room</label>
+                    <label><input type="checkbox" ref="guests_read" defaultChecked={history_visibility === "world_readable"}/> Let users read message history without joining</label>
+                    <label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label>
+                </div>
+
+
                 { room_colors_section }
 
                 { aliases_section }
 
-                <h3>Notifications</h3>
-                <div className="mx_RoomSettings_settings">
-                    <label><input type="checkbox" ref="are_notifications_muted" defaultChecked={are_notifications_muted}/> Mute notifications for this room</label>
-                </div>
-
                 <h3>Permissions</h3>
                 <div className="mx_RoomSettings_powerLevels mx_RoomSettings_settings">
                     <div className="mx_RoomSettings_powerLevel">
@@ -736,7 +736,7 @@ module.exports = React.createClass({
                 { unfederatable_section }                    
                 </div>
 
-                <h3>Users</h3>
+                <h3>Privileged Users</h3>
                 <div className="mx_RoomSettings_userLevels mx_RoomSettings_settings">
                     <div>
                         Your role in this room is currently <b><PowerSelector room={ this.props.room } value={current_user_level} disabled={true}/></b>.