diff --git a/public/less/_base.less b/public/less/_base.less
index 4f4c1ed5d..e0686fe41 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -443,3 +443,318 @@ footer {
 	margin-top: 0;
     margin-bottom: 0;
 }
+
+
+@media (max-width: 1020px) {
+	@media (max-width: 1020px) {
+	body {
+	  min-width: 320px !important;
+	  max-width: 100%;
+	}
+	
+	img, table, td, blockquote, code, pre, textarea, input, iframe, object, embed, video {
+		max-width: 100%;
+	}
+	
+	.item.brand,
+	.six.wide.column,
+	.ui.five.wide.column{
+		display: none !important;
+	}
+	
+	.ten.wide.column,
+	.ui.grid > [class*="four wide"].column,
+	.ui.eleven.wide.column,
+	.ui.grid > [class*="twelve wide"].column,
+	.full.height,
+	.dashboard,
+	.following.bar.light,
+	[class*="vertically padded"].ui.grid,
+	#release-list .ui.grid,
+	#git-stats,
+	.repository.new.repo .ui.form .selection.dropdown:not(.owner),
+	.repository.new.repo form input, 
+	.repository.new.migrate form input, 
+	.repository.new.fork form input, 
+	.repository.new.repo form textarea, 
+	.repository.new.migrate form textarea, 
+	.repository.new.fork form textarea,
+	.ui.form .inline.field > .selection.dropdown,
+	.ui.form .inline.fields .field > .selection.dropdown,
+	.feeds .news .issue.title
+	{
+		width: 100% !important;
+	}
+	
+	.ui.vertically.padded.grid.head .column{
+		padding: 0;
+	}
+	
+	.ui.header .ui.right .ui.small.button,
+	.ui.header .ui.right .ui.labeled.button{
+		margin: 5px 2.5px;
+	}
+	
+	.ui.container,
+	.ui.container:not(.fluid)
+	{
+		width: 90% !important;
+		margin: auto 5% !important;
+		/*margin: 0 !important;*/
+	}
+	
+	.ui.grid.news{
+		max-width: 100% !important;
+	}
+	
+	footer{
+		width: 100%;
+		height: 75px;
+		bottom: 0;
+		position: relative;
+	}
+	
+	footer .ui.container{
+		height: 100%;
+	}
+	
+	footer .version{
+		display: none;
+	}
+	
+	footer .ui.left{
+		width: 70%;
+		word-wrap: break-word;
+	}
+	
+	.ui.right .ui.secondary.head.menu .item[href^="/org/"]{
+		display: none;
+	}
+	
+	.ui.language.bottom.floating.slide.up.dropdown.link.item{
+		right: 5%;
+		position: absolute;
+		bottom: 36.5%;
+	}
+	
+	.ui.grid > [class*="ten wide"].column {
+		width: 100% !important;
+	}
+	
+	.following.bar a.main-menu.item .menu-icon.octicon{
+		display: block;
+		font-size: large;
+		text-indent: 0;
+		margin: 5px auto !important;
+	}
+	
+	.following.bar a.main-menu.item.active{
+		width: 50px;
+	}
+	
+	.following.bar a.main-menu.item{
+		text-indent: -9999px;
+		white-space: nowrap; 
+		overflow: hidden;
+		font-size: 0px;
+		width: 35px;
+	}
+	
+	.following.bar a.main-menu.item .menu-icon.octicon.octicon-git-pull-request{
+		padding-left: 5px;
+	}
+	
+	.ui.vertical.menu{
+		margin: 0 auto !important;
+		width: 90%;
+	}
+	
+	.ui.header{
+		text-align: center;
+	}
+	
+	.column .ui.header .ui.right{
+		padding-top: 5px;
+		width: 90%;
+		margin: 0 auto;
+		float: none;
+	}
+	
+	.ui.user.list .item .content{
+		width: 85%;
+	}
+	
+	.ui.user.list .item .content .br{
+		display: block;
+	}
+	
+	.ui.user.list .item .content .octicon.octicon-location{
+		padding-left: 5px;
+	}
+	
+	.ui.container .ui.grid .ui.eleven.wide.column .text.right .ui.green.button{
+		width: 100%;
+	}
+	
+	.repository .ui.container .ui.secondary.menu{
+		padding: 6px 6px 30px;
+		position: relative;
+		width: 100%;
+	}
+	
+	
+	.repository.file.list #repo-files-table .grey.has-emoji,
+	.repository.file.list #repo-files-table thead th,
+	.repository.file.list #repo-files-table td.message.collapsing.has-emoji{
+		display: none;
+	}
+	
+	.repository.file.list #repo-files-table thead th:first-child {
+		width: 200%;
+	}
+	
+	.repository.file.list #repo-files-table tr{
+		width: 100%;
+	}
+	.ui.container .ui.header .ui.right .ui.small.button{
+		margin: 0;
+	}
+	
+	.ui.attached.header .right{
+		margin-top: 5px;
+		float: none;
+	}
+	
+	#commits-table tbody tr .message.collapsing span,
+	#commits-table thead tr .nine.wide.message span.commits-message{
+		display: none;
+	}
+	
+	#commits-table thead tr th.four.wide,
+	#commits-table thead tr th.nine.wide.message,
+	#commits-table thead tr th.three.wide{
+		width: 33%;
+	}
+	
+	#file-buttons{
+		display: none !important;
+	}
+	
+	.ui.menu .right.fitted.item{
+		height:30px; 
+		width:100%; 
+		top: 50px;
+		position:absolute; 
+		bottom:0;
+	}
+	
+	.ui.tabs.container .ui.tabular.menu .item{
+		text-indent: -9999px;
+		white-space: nowrap; 
+		overflow: hidden;
+		font-size: 0px;
+		width: 50px;
+	}
+	
+	.repository .ui.container .ui.secondary.menu.right.floated.menu{
+		display: none;
+	}
+	.ui.grid > [class*="one wide"].column{
+		margin-left: -3.25em;
+		margin-top: 3em;
+		position: absolute;
+	}
+	
+	.ui.tabular.menu .item i{
+		text-indent: 0;
+	}
+	
+	.ui.tabular.menu .item span{
+		text-indent: 0;
+		margin-left: 0 !important;
+		margin: auto;
+	}
+	
+	.repository .header-wrapper .ui.tabular .octicon{
+		margin: 0 auto !important;
+	}
+	.repository .header-wrapper .ui.tabular .octicon.octicon-file-text{
+		padding-left: 5px;
+	}
+	
+	.ui.tabular.menu .right.menu{
+		/*margin-right: 5%;*/
+	}
+	
+	#repo-desc{
+		text-align: center;
+	}
+	
+	.repository.release #release-list > li .meta {
+		text-align: left;
+		padding-bottom: 0;
+		border-left: 1px solid #DDD;
+	}
+	.repository.release #release-list > li .detail{
+		padding-top: 10px;
+	}
+	
+	.repository.new.repo form .header, 
+	.repository.new.migrate form .header,
+	.repository.new.fork form .header,
+	.organization.new.org form .header,
+	.ui.top.attached.header{
+		padding-left: 0 !important;
+	}
+	
+	.repository.new.repo form .inline.field > label, 
+	.repository.new.migrate form .inline.field > label, 
+	.repository.new.fork form .inline.field > label,
+	.organization.new.org form .inline.field > label,
+	.ui.form .inline.field > :first-child, 
+	.ui.form .inline.fields .field > :first-child{
+		text-align: left;
+	}
+	
+	.inline.field a[href^="/user/sign_up"]{
+		white-space: nowrap;
+	}
+	
+	.repository.new.repo .ui.form #auto-init,
+	.repository.new.repo form .optional .title,
+	.repository.new.migrate form .optional .title,
+	.repository.new.fork form .optional .title
+	.repository.new.repo form .help, .repository.new.migrate form .help, 
+	.repository.new.fork form .help,
+	.organization.new.org form .help{
+		margin-left: 0 !important;
+	}
+	
+	.repository .ui.container .navbar .ui.compact.small.menu,
+	.ui.form .inline.field > input, 
+	.ui.form .inline.field > select, 
+	.ui.form .inline.fields .field > input, 
+	.ui.form .inline.fields .field > select{
+		width: 100% !important;
+	}
+	
+	.repository .ui.container .navbar .ui.compact.small.menu .item{
+		position: relative;
+		width: 50%;
+		text-align: center;
+	}
+	.repository .ui.container .navbar .ui.right{
+		margin-top: 5px;
+		float: none;
+	}
+	.repository .ui.container .navbar .ui.right .ui.green.button{
+		margin: auto;
+		display: table;
+	}
+	
+	.ui.form .field:last-child,
+	.ui.form .field:last-child .ui.button{
+		width: 100%;
+		margin: 3px auto;
+	}
+}
\ No newline at end of file
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 1c8aa8c1d..3dbee0df0 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -11,6 +11,7 @@
 	<meta name="referrer" content="no-referrer" />
 	<meta name="_csrf" content="{{.CSRFToken}}" />
 	<meta name="_suburl" content="{{AppSubURL}}" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 	
 	<!-- Open Graph Tags -->
 	{{if .PageIsAdmin}}
@@ -93,14 +94,25 @@
 								</a>
 
 								{{if .IsLogged}}
-									<a class="item{{if .PageIsDashboard}} active{{end}}" href="{{AppSubURL}}/">{{.i18n.Tr "dashboard"}}</a>
-									<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubURL}}/issues">{{.i18n.Tr "issues"}}</a>
-									<a class="item{{if .PageIsPulls}} active{{end}}" href="{{AppSubURL}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
+									<a class="main-menu item{{if .PageIsDashboard}} active{{end}}" href="{{AppSubURL}}/">{{.i18n.Tr "dashboard"}}
+										<i class="menu-icon octicon octicon-home"></i>
+									</a>
+									<a class="main-menu item{{if .PageIsIssues}} active{{end}}" href="{{AppSubURL}}/issues">{{.i18n.Tr "issues"}}
+										<i class="menu-icon octicon octicon-issue-opened"></i>
+									</a>
+									<a class="main-menu item{{if .PageIsPulls}} active{{end}}" href="{{AppSubURL}}/pulls">{{.i18n.Tr "pull_requests"}}
+										<i class="menu-icon octicon octicon-git-pull-request"></i>
+									</a>
 								{{else}}
-									<a class="item{{if .PageIsHome}} active{{end}}" href="{{AppSubURL}}/">{{.i18n.Tr "home"}}</a>
+									<a class="main-menu item{{if .PageIsHome}} active{{end}}" href="{{AppSubURL}}/">{{.i18n.Tr "home"}}
+										<i class="menu-icon octicon octicon-home"></i>
+									</a>
 								{{end}}
 
-								<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubURL}}/explore/repos">{{.i18n.Tr "explore"}}</a>
+								<a class="main-menu item{{if .PageIsExplore}} active{{end}}" href="{{AppSubURL}}/explore/repos">{{.i18n.Tr "explore"}}
+									<i class="menu-icon octicon octicon-file-directory"></i>
+								</a>
+
 								{{/*<div class="item">
 									<div class="ui icon input">
 									<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
@@ -169,15 +181,17 @@
 
 								{{else}}
 
-									<a class="item" target="_blank" href="https://gogs.io/docs" rel="noreferrer">{{.i18n.Tr "help"}}</a>
+									<a class="main-menu item" target="_blank" href="https://gogs.io/docs" rel="noreferrer">{{.i18n.Tr "help"}}
+										<i class="menu-icon octicon octicon-info"></i>
+									</a>
 									<div class="right menu">
 										{{if .ShowRegistrationButton}}
-											<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubURL}}/user/sign_up">
-												<i class="octicon octicon-person"></i> {{.i18n.Tr "register"}}
+											<a class="main-menu item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubURL}}/user/sign_up">
+												<i class="menu-icon octicon octicon-person"></i> {{.i18n.Tr "register"}}
 											</a>
 										{{end}}
-										<a class="item{{if .PageIsSignIn}} active{{end}}" href="{{AppSubURL}}/user/login?redirect_to={{.Link}}">
-											<i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}
+										<a class="main-menu item{{if .PageIsSignIn}} active{{end}}" href="{{AppSubURL}}/user/login?redirect_to={{.Link}}">
+											<i class="menu-icon octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}
 										</a>
 									</div><!-- end anonymous right menu -->
 
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index 6f1b2ee81..a9c7adef2 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -17,9 +17,11 @@
 										<i class="octicon octicon-location"></i> {{.Location}}
 									{{end}}
 									{{if and .Email $.IsLogged}}
+									<br class="br" />
 										<i class="octicon octicon-mail"></i>
 										<a href="mailto:{{.Email}}" rel="nofollow">{{.Email}}</a>
 									{{end}}
+									<br class="br" />
 									<i class="octicon octicon-clock"></i> {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}}
 						    </div>
 						  </div>
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index 1b835d33c..8f663bdf9 100644
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -24,7 +24,7 @@
 			<thead>
 				<tr>
 					<th class="four wide">{{.i18n.Tr "repo.commits.author"}}</th>
-					<th class="nine wide message"><span class="sha">SHA1</span> {{.i18n.Tr "repo.commits.message"}}</th>
+					<th class="nine wide message"><span class="sha">SHA1</span><span class="commits-message">{{.i18n.Tr "repo.commits.message"}}</span></th>
 					<th class="three wide right aligned">{{.i18n.Tr "repo.commits.date"}}</th>
 				</tr>
 			</thead>