diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx
index 9ff67ae1b7..94be2acd6b 100644
--- a/web/react/components/invite_member_modal.jsx
+++ b/web/react/components/invite_member_modal.jsx
@@ -162,25 +162,31 @@ module.exports = React.createClass({
                 invite_sections[index] = (
                     <div key={"key" + index}>
                     <div>
-                        <button type="button" className="btn remove__member" onClick={this.removeInviteFields.bind(this, index)}>×</button>
+                        <button type="button" className="btn btn-link remove__member" onClick={this.removeInviteFields.bind(this, index)}><span className="fa fa-trash"></span></button>
                     </div>
                     <div className={ email_error ? "form-group invite has-error" : "form-group invite" }>
                         <input onKeyUp={this.displayNameKeyUp} type="text" ref={"email"+index} className="form-control" placeholder="email@domain.com" maxLength="64" />
                         { email_error }
                     </div>
+                    <div className="row--invite">
                     { config.AllowInviteNames ?
-                    <div className={ first_name_error ? "form-group invite has-error" : "form-group invite" }>
-                        <input type="text" className="form-control" ref={"first_name"+index} placeholder="First name" maxLength="64" />
-                        { first_name_error }
+                    <div className="col-sm-6">
+                        <div className={ first_name_error ? "form-group has-error" : "form-group" }>
+                            <input type="text" className="form-control" ref={"first_name"+index} placeholder="First name" maxLength="64" />
+                            { first_name_error }
+                        </div>
                     </div>
                     : "" }
                     { config.AllowInviteNames ?
-                    <div className={ last_name_error ? "form-group invite has-error" : "form-group invite" }>
-                        <input type="text" className="form-control" ref={"last_name"+index} placeholder="Last name" maxLength="64" />
-                        { last_name_error }
+                    <div className="col-sm-6">
+                        <div className={ last_name_error ? "form-group has-error" : "form-group" }>
+                            <input type="text" className="form-control" ref={"last_name"+index} placeholder="Last name" maxLength="64" />
+                            { last_name_error }
+                        </div>
                     </div>
                     : "" }
                     </div>
+                    </div>
                 );
             }
 
@@ -203,7 +209,7 @@ module.exports = React.createClass({
                                 <button type="button" className="btn btn-default" onClick={this.addInviteFields}>Add another</button>
                                 <br/>
                                 <br/>
-                                <label className='control-label'>People invited automatically join Town Square channel.</label>
+                                <span>People invited automatically join Town Square channel.</span>
                             </div>
                             <div className="modal-footer">
                               <button type="button" className="btn btn-default" data-dismiss="modal">Close</button>
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 3fac410731..25834b9e5e 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -129,7 +129,7 @@ module.exports = React.createClass({
 
         if (numMentions < 1) return (<div/>);
 
-        var height = (numMentions*37) + 2;
+        var height = (numMentions*36) + 4;
         var width = $('#'+this.props.id).parent().width();
         var bottom = $(window).height() - $('#'+this.props.id).offset().top;
         var left = $('#'+this.props.id).offset().left;
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 124e617bd6..fb96cc99fd 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -130,7 +130,7 @@ module.exports = React.createClass({
                 </div>
                 { email }
                 <label className="control-label">Password</label>
-                <div className={ name_error ? "form-group has-error" : "form-group" }>
+                <div className={ password_error ? "form-group has-error" : "form-group" }>
                 <input type="password" ref="password" className="form-control" placeholder="" maxLength="128" />
                 { password_error }
                 </div>
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index cf28e44e88..fd6225bddc 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -154,9 +154,4 @@ div.theme {
     text-decoration: none;
     padding: 0 10px;
   }
-}
-
-.invite {
-  width: 90%;
-}
-
+}
\ No newline at end of file
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index d6e2ab3680..da46866c82 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -11,12 +11,13 @@
 	position: absolute;
 	z-index: 1060;
 	.mentions-box {
+		max-height: 303px;
 		position:absolute;
 		background-color:#fff;
 		border: $border-gray;
-        overflow-x: hidden;
-        overflow-y: scroll;
-        bottom:0;
+		overflow-x: hidden;
+		overflow-y: scroll;
+		bottom:0;
 	}
 }
 
@@ -24,13 +25,15 @@
 	position:relative;
 	width:100%;
 	background-color:#fff;
-	height:37px;
+	height:36px;
 	padding:2px;
 	z-index:101;
-    cursor: pointer;
-    &:hover {
-        background-color:#e8eaed;
-    }
+	line-height: 36px;
+	font-size: 13px;
+	cursor: pointer;
+	&:hover {
+		background-color: #E6F2FA;
+	}
 }
 
 .mentions-text {
@@ -38,15 +41,20 @@
 }
 
 .mention-img {
-	margin-right:10px;
-	height:32px;
-	width:32px;
-	border-radius: 10%;
+	margin-right: 6px;
+	height: 32px;
+	width: 32px;
+	line-height: 36px;
+	display: block;
+	font-size: 20px;
+	text-align: center;
+	color: #555;
+	@include border-radius(3px);
 }
 
 .mention-fullname {
-    color: grey;
-    padding-left: 10px;
+	color: grey;
+	padding-left: 10px;
 }
 
 .mention-highlight {
@@ -55,9 +63,4 @@
 
 .mention-link {
 	color:$primary-color;
-}
-
-.mention-align {
-	position:relative;
-	top:5px;
-}
+}
\ No newline at end of file
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 637f908ca0..707e71cf0a 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -15,6 +15,10 @@
 	}
 	.remove__member {
 		float: right;
+		color: #E56565;
+		font-size: 20px;
+		line-height: 0;
+		padding: 6px;
 	}
 	.modal-dialog {
 		max-width: 95%;
@@ -268,3 +272,19 @@
 		}
 	}
 }
+
+// Invite New Member
+.invite {
+	margin-right: 40px;
+}
+
+.row--invite {
+	margin-right: 40px;
+	@include clearfix;
+	.col-sm-6 {
+		padding: 0 0 0 15px;
+		&:first-child {
+			padding-left: 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/web/sass-files/sass/partials/_perfect-scrollbar.scss b/web/sass-files/sass/partials/_perfect-scrollbar.scss
index f253d0792e..f38c6062f5 100755
--- a/web/sass-files/sass/partials/_perfect-scrollbar.scss
+++ b/web/sass-files/sass/partials/_perfect-scrollbar.scss
@@ -3,7 +3,7 @@
   .ps-container.ps-active-x > .ps-scrollbar-x-rail, .ps-container.ps-active-y > .ps-scrollbar-y-rail {
     display: block; }
   .ps-container.ps-in-scrolling {
-    pointer-events: none; }
+     }
     .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
       background-color: #eee;
       opacity: 0.9;
@@ -85,7 +85,7 @@
       /* there must be 'right' for ps-scrollbar-y */
       width: 8px; }
   .ps-container:hover.ps-in-scrolling {
-    pointer-events: none; }
+     }
     .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
       background-color: #eee;
       opacity: 0.9;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 0eeaa3615f..9c0c09ee3b 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -276,6 +276,11 @@
             }
         }
     }
+    .row--invite {
+        .col-sm-6 {
+            padding: 0;
+        }
+    }
     .settings-modal {
         &.display--content {
             .modal-header {
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 8917ebb9f7..a714aa44f6 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -20,7 +20,7 @@
         font-size: em(28px);
     }
     h3 {
-    	font-weight: 600;
+        font-weight: 600;
         margin: 0 0 1.3em 0;
         font-size: 1.4em;
     }
@@ -91,6 +91,8 @@
     .has-error {
         .control-label {
             margin-top: 5px;
+            font-size: 14px;
+            font-weight: 600;
         }
     }
     .reset-form {
@@ -114,6 +116,6 @@
 }
 
 .signup-team-login {
-	padding-bottom: 10px;
-	font-weight: 700;
+    padding-bottom: 10px;
+    font-weight: 700;
 }
\ No newline at end of file