diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx
index 0c1a55cc16..009a9f0048 100644
--- a/web/react/components/admin_console/user_item.jsx
+++ b/web/react/components/admin_console/user_item.jsx
@@ -353,7 +353,7 @@ export default class UserItem extends React.Component {
 
         return (
             <tr>
-                <td className='row member-div'>
+                <td className='row member-div padding--equal'>
                     <img
                         className='post-profile-img pull-left'
                         src={`/api/v1/users/${user.id}/image?time=${user.update_at}&${Utils.getSessionIndex()}`}
diff --git a/web/react/components/channel_info_modal.jsx b/web/react/components/channel_info_modal.jsx
index 5067f59133..83f5aba651 100644
--- a/web/react/components/channel_info_modal.jsx
+++ b/web/react/components/channel_info_modal.jsx
@@ -56,7 +56,7 @@ class ChannelInfoModal extends React.Component {
                         </div>
                         <div className='col-sm-9'>{channelURL}</div>
                     </div>
-                    <div className='row'>
+                    <div className='row form-group'>
                         <div className='col-sm-3 info__label'>
                             <FormattedMessage
                                 id='channel_info.id'
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index e6a9fbd25f..8352986352 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -25,6 +25,7 @@ const ActionTypes = Constants.ActionTypes;
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 
 import {FormattedMessage} from 'mm-intl';
+import attachFastClick from 'fastclick';
 
 const Popover = ReactBootstrap.Popover;
 const OverlayTrigger = ReactBootstrap.OverlayTrigger;
@@ -59,6 +60,7 @@ export default class Navbar extends React.Component {
         ChannelStore.addChangeListener(this.onChange);
         ChannelStore.addExtraInfoChangeListener(this.onChange);
         $('.inner__wrap').click(this.hideSidebars);
+        attachFastClick(document.body);
     }
     componentWillUnmount() {
         ChannelStore.removeChangeListener(this.onChange);
diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx
index 0a1b028533..c1b2a2e7f4 100644
--- a/web/react/components/team_general_tab.jsx
+++ b/web/react/components/team_general_tab.jsx
@@ -486,13 +486,9 @@ class GeneralTab extends React.Component {
             inputs.push(
                 <div key='teamInviteSetting'>
                     <div className='row'>
-                        <label className='col-sm-5 control-label'>
-                            <FormattedMessage
-                                id='general_tab.codeTitle'
-                                defaultMessage='Invite Code'
-                            />
+                        <label className='col-sm-5 control-label visible-xs-block'>
                         </label>
-                        <div className='col-sm-7'>
+                        <div className='col-sm-12'>
                             <input
                                 className='form-control'
                                 type='text'
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index c6532b018d..e79ec6f6c2 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -183,7 +183,7 @@ export default class ManageIncomingHooks extends React.Component {
             <div key='addIncomingHook'>
                 <FormattedHTMLMessage
                     id='user.settings.hooks_in.description'
-                    defaultMessage='Create webhook URLs for use in external integrations. Please see<a href="http://mattermost.org/webhooks" target="_blank">http://mattermost.org/webhooks</a> to learn more.'
+                    defaultMessage='Create webhook URLs for use in external integrations. Please see <a href="http://mattermost.org/webhooks" target="_blank">http://mattermost.org/webhooks</a> to learn more.'
                 />
                 <div><label className='control-label padding-top x2'>
                     <FormattedMessage
diff --git a/web/react/package.json b/web/react/package.json
index fce3e6555e..5fc2f28518 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "autolinker": "0.22.0",
+    "fastclick": "^1.0.6",
     "flux": "2.1.1",
     "highlight.js": "8.9.1",
     "keymirror": "0.1.1",
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 17f30a7c52..4939160588 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -222,7 +222,7 @@ class MattermostMarkdownRenderer extends marked.Renderer {
     }
 
     table(header, body) {
-        return `<table class="markdown__table"><thead>${header}</thead><tbody>${body}</tbody></table>`;
+        return `<div class="table-responsive"><table class="markdown__table"><thead>${header}</thead><tbody>${body}</tbody></table></div>`;
     }
 
     listitem(text) {
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index 339d9f45f6..f34b5ec197 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -31,6 +31,7 @@
 }
 
 .post-body--code__language {
+	-webkit-transform: translate3d(0,0,0);
 	position: absolute;
 	top: 0;
 	right: 0;
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index db99e840b2..9d4e62bc31 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -7,6 +7,67 @@
 	padding: 20px 15px;
 	overflow: auto;
 }
+.more-table {
+	margin: 0;
+	table-layout: fixed;
+	p {
+		font-size: 0.9em;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		@include opacity(0.8);
+		margin: 5px 0;
+	}
+	.profile-img {
+		-moz-border-radius: 50px;
+		-webkit-border-radius: 50px;
+		border-radius: 50px;
+		margin-right: 8px;
+	}
+	.more-name {
+		font-weight: 600;
+		font-size: 0.95em;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	.more-description {
+		@include opacity(0.7);
+		display: block;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	tbody {
+		> tr {
+			&:hover td {
+				background: #f7f7f7;
+			}
+			&:first-child {
+				td {
+					border: none;
+				}
+			}
+			td {
+				width: 100%;
+				white-space: nowrap;
+				@include legacy-pie-clearfix;
+				text-overflow: ellipsis;
+				padding: 8px 8px 8px 15px;
+				&.padding--equal {
+					padding: 8px;
+				}
+				&.td--action {
+					text-align: right;
+					padding: 8px 15px 8px 8px;
+					width: 80px;
+					vertical-align: middle;
+					position: relative;
+					&.lg {
+						width: 110px;
+					}
+				}
+			}
+		}
+	}
+}
 .modal {
 	width: 100%;
 	color: #333;
@@ -148,64 +209,6 @@
 			padding: 0;
 		}
 	}
-	.more-table {
-		margin: 0;
-		table-layout: fixed;
-		p {
-			font-size: 0.9em;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			@include opacity(0.8);
-			margin: 5px 0;
-		}
-		.profile-img {
-			-moz-border-radius: 50px;
-			-webkit-border-radius: 50px;
-			border-radius: 50px;
-			margin-right: 8px;
-		}
-		.more-name {
-			font-weight: 600;
-			font-size: 0.95em;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-		.more-description {
-			@include opacity(0.7);
-			display: block;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-		tbody {
-			> tr {
-				&:hover td {
-					background: #f7f7f7;
-				}
-				&:first-child {
-					td {
-						border: none;
-					}
-				}
-				td {
-					width: 100%;
-					white-space: nowrap;
-					@include legacy-pie-clearfix;
-					text-overflow: ellipsis;
-					padding: 8px 8px 8px 15px;
-					&.td--action {
-						text-align: right;
-						padding: 8px 15px 8px 8px;
-						width: 80px;
-						vertical-align: middle;
-						position: relative;
-						&.lg {
-							width: 110px;
-						}
-					}
-				}
-			}
-		}
-	}
 	.modal-image {
 		position:relative;
 		width:100%;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 5d6cbee608..2374a9dbba 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -776,6 +776,24 @@
     }
 }
 @media screen and (max-width: 480px) {
+    .settings-modal {
+
+         .settings-table {
+
+            .security-links {
+                margin-bottom: 10px;
+                display: block;
+
+                &:last-child {
+                    margin-bottom: 0;
+                }
+
+            }
+
+         }
+
+    }
+
     .tip-overlay.tip-overlay--sidebar {
         min-height: 350px;
     }
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 1bbec566cb..de7df403fd 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -207,6 +207,7 @@
         .section-title {
             margin-bottom: 5px;
             font-weight: 600;
+            padding-right: 50px;
         }
 
         .section-edit {
diff --git a/web/sass-files/sass/partials/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss
index 0a2d1e704d..1f93fc6a99 100644
--- a/web/sass-files/sass/partials/_tutorial.scss
+++ b/web/sass-files/sass/partials/_tutorial.scss
@@ -105,7 +105,7 @@
         font-size: 12px;
 
         span {
-            @include opacity(0.5);
+            @include opacity(0.9);
         }
 
     }