diff --git a/core/admin/assets/sass/layouts/settings.scss b/core/admin/assets/sass/layouts/settings.scss
index 368e9d6c25..d99633418a 100644
--- a/core/admin/assets/sass/layouts/settings.scss
+++ b/core/admin/assets/sass/layouts/settings.scss
@@ -14,7 +14,6 @@
    ============================================================================= */
 
 .settings {
-    
     // The main white bg for the page
     .wrapper {
         background: #fff;
@@ -42,7 +41,7 @@
 /* =============================================================================
    Sidebar
    ============================================================================= */
-    
+
     //The whole left column sidebar, duh.
     .settings-sidebar {
         width:20%;
@@ -68,7 +67,7 @@
             };
         }
     }//.settings-sidebar
-        
+
     //Main settings-menu styles, apply to every item
     .settings-menu {
         position:absolute;
@@ -112,8 +111,8 @@
                     position:relative;
                     z-index: 300;
                     border-top: #edece4 1px solid;
-                    box-shadow: 
-                        #fff 1px 0 0, 
+                    box-shadow:
+                        #fff 1px 0 0,
                         #edece4 0 1px 0;
                     @include transition;
 
@@ -151,7 +150,7 @@
 /* =============================================================================
    Content
    ============================================================================= */
-    
+
     // The main content panel on the right
     .settings-content {
         padding:0;
@@ -164,7 +163,7 @@
 
         display: none;
         &.active {display:block;}
-        
+
         > header {
             height: 17px;
             padding: 30px 220px 29px 40px;
@@ -217,95 +216,130 @@
             right:0;
             left:0;
             bottom:0;
-            overflow:auto;
             padding:40px;
+            overflow:auto;
+
             @include breakpoint($netbook) { padding-left:15px; }
             @include breakpoint($letterbox) { top: 0; }
+        }
 
-            .sub{
-              color: rgb(158, 157, 149);
-              padding-bottom: 20px;
-              -moz-border-bottom-colors: none;
-              -moz-border-left-colors: none;
-              -moz-border-right-colors: none;
-              -moz-border-top-colors: none;
-              border-color: -moz-use-text-color -moz-use-text-color #EDECE4;
-              border-image: none;
-              border-right: 0 none;
-              border-style: none none solid;
-              border-width: 0 0 1px;
-              margin-bottom: 0px;
+
+        .user-group-header {
+            margin-bottom: 0px;
+            padding-bottom: 20px;
+            border: 0 none;
+            border-bottom: 1px solid darken($lightbrown, 10%);
+
+            h3 {
+                display: inline-block;
+                margin: 0;
+                color: $midbrown;
+                font-weight: normal;
+                font-size: 1.1em;
+                line-height: 1em;
             }
-            ul.users{
-              list-style: none;
-              padding: 0px;
-              margin-top: 0px;
-              width: 75%;
-              clear: both;
-              li{
-                display: block;
-                width: 100%;
-                padding: 20px;
+
+        }
+
+        .user-search {
+            display: inline-block;
+            float: right;
+
+            label { margin: 0}
+
+            &:hover .user-search-input, .user-search-input:focus {
+                width: 260px;
+                padding: 0 10px;
+            }
+
+            .user-search-input {
                 @include box-sizing(border-box);
-                -moz-border-bottom-colors: none;
-                -moz-border-left-colors: none;
-                -moz-border-right-colors: none;
-                -moz-border-top-colors: none;
-                border-color: -moz-use-text-color -moz-use-text-color #EDECE4;
-                border-image: none;
-                border-right: 0 none;
-                border-style: none none solid;
-                border-width: 0 0 1px;
-
-                &:last-child{
-                  border: none;
-                }
-                .user_image{
-                  float: left;
-                  width: 40px;
-                  height: 40px;
-                  margin-right: 17px;
-                  background-color: #ccc;
-                  border-radius: 20px;
-
-                  img{
-                    width: 40px;
-                    height: 40px;
-                    border-radius: 20px;
-                  }
-                }
-
-                .user_info{
-                  float: left;
-                  span{
-                    display: block;
-                    line-height: 1em;
-                    &.name{
-                      margin-top: 0.4em;
-                      font-weight: bold;
-                      font-size: 1.2em;
-                    }
-                  }
-                }
-
-                label{
-                  float: right;
-                  color: #fff;
-                  padding: 4px 8px;
-                  margin-right: 20px;
-                  &.admin{
-                    background-color: #DE523A;
-                  }
-
-                  &.editor{
-                    background-color: #4A8CBD;
-                  }
-                }
-              }
+                width: 0px;
+                padding: 0;
+                border: none;
+                border-bottom: lighten($lightbrown, 2%) 1px solid;
+                @include transition(width 0.2s ease-in-out);
+                box-shadow: none;
+            }
 
+            .search-icon {
+                @include icon($i-search, 1em, $midbrown);
             }
         }
 
+        .users {
+            padding: 0px;
+            margin-top: 0px;
+            list-style: none;
+        }
+
+        .user {
+            @include box-sizing(border-box);
+            display: block;
+            width: 100%;
+            padding: 20px;
+            border: 0 none;
+            border-top: 1px solid $lightgrey;
+
+            &:first-child {
+                border: none;
+            }
+
+            .user-image {
+                display: inline-block;
+                width: 40px;
+                height: 40px;
+                margin-right: 17px;
+                vertical-align: middle;
+                background-color: $lightbrown;
+                border-radius: 20px;
+
+                &.invite {
+                    @include box-sizing(border-box);
+                    padding-top: 8px;
+                    text-align: center;
+                    @include icon($i-mail, 1em, $brown);
+                }
+
+                img {
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 20px;
+                }
+            }
+
+            .user-meta {
+                display: inline-block;
+                vertical-align: middle;
+
+                .user-name {
+                    margin: 0;
+                    margin-top: 0.4em;
+                    font-weight: 400;
+                    font-size: 1.2em;
+                    line-height: 1em;
+                }
+
+                .user-last-seen {
+                    line-height: 1em;
+                }
+            }
+        }
+
+        .user-role {
+            padding: 2px 8px;
+            float: right;
+            font-size: 0.8em;
+            color: #fff;
+            text-transform: uppercase;
+
+            &.admin {
+                background-color: #DE523A;
+            }
+            &.editor {
+                background-color: #4A8CBD;
+            }
+        }
     }//.settings-content
 
 }//.settings
diff --git a/core/admin/views/settings.hbs b/core/admin/views/settings.hbs
index 447f13dfbc..db68e5053c 100644
--- a/core/admin/views/settings.hbs
+++ b/core/admin/views/settings.hbs
@@ -157,43 +157,57 @@
             <header>
                 <h2 class="title">Users</h2>
                 <section class="page-actions">
-                    <button class="button-add">Add User</button>
+                    <button class="button-add">New User</button>
                 </section>
             </header>
             <section class="content">
-                <h6 class="sub">Invited Users</h6>
-                <ul class="users">
-                    <li class="clearfix">
-                        <div class="user_image"></div>
-                        <div class="user_info">
-                            <span class="name">Some Name</span>
-                            <span class="timestamp">Invitation Sent: 7 hours ago</span>
-                        </div>
-                    </li>
-                </ul>
-                <h6 class="sub">Active Users</h6>
-                <ul class="users">
-                    <li class="clearfix">
-                        <div class="user_image">
-                            <img src="/core/admin/assets/img/user.jpg" alt="user"/>
-                        </div>
-                        <div class="user_info">
-                            <span class="name">Some Name</span>
-                            <span class="timestamp">Last Seen: 7 hours ago</span>
-                        </div>
-                        <label class="admin">Admin</label>
-                    </li>
-                    <li class="clearfix">
-                        <div class="user_image">
-                            <img src="/core/admin/assets/img/user.jpg" alt="user"/>
-                        </div>
-                        <div class="user_info">
-                            <span class="name">Some Name</span>
-                            <span class="timestamp">Last Seen: 2 days ago</span>
-                        </div>
-                        <label class="editor">Editor</label>
-                    </li>
-                </ul>
+                <section id="users-pending" class="user-group">
+                    <header class="user-group-header"><h3>Invited Users</h3></header>
+                    <ul class="users">
+                        <li class="user">
+                            <figure class="user-image invite"></figure>
+                            <section class="user-meta">
+                                <h4 class="user-name">Some Name</h4>
+                                <span class="user-last-seen">Invitation Sent: 7 hours ago</span>
+                            </section>
+                        </li>
+                    </ul>
+                </section>
+                <section id="users-active" class="user-group">
+                    <header class="user-group-header">
+                        <h3>Active Users</h3>
+
+                        <form class="user-search">
+                            <label>
+                                <i class="search-icon"></i>
+                                <input class="user-search-input" type="text"/>
+                            </label>
+                        </form>
+                    </header>
+
+                    <ul class="users">
+                        <li class="user">
+                            <figure class="user-image">
+                                <img src="/core/admin/assets/img/user.jpg" alt="user"/>
+                            </figure>
+                            <section class="user-meta">
+                                <h4 class="user-name">Some Name</h4>
+                                <span class="user-last-seen">Last Seen: 7 hours ago</span>
+                            </section>
+                            <span class="user-role admin">Admin</span>
+                        </li>
+                        <li class="user">
+                            <figure class="user-image">
+                                <img src="/core/admin/assets/img/user.jpg" alt="user"/>
+                            </figure>
+                            <section class="user-meta">
+                                <h4 class="user-name">Some Name</h4>
+                                <span class="user-last-seen">Last Seen: 2 days ago</span>
+                            </section>
+                            <span class="user-role editor">Editor</span>
+                        </li>
+                    </ul>
+                </section>
             </section>
         </section>
         <section id="appearance" class="settings-content">