diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 9c45007e5..0f862da7a 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -9,14 +9,14 @@
 			<div class="ui sixteen wide computer column list">
 				{{ range .Members}}
 					<div class="item ui grid">
-						<div class="ui two wide column">
+						<div class="three wide mobile two wide tablet two wide computer column">
 							<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
 						</div>
-						<div class="ui three wide column">
+						<div class="seven wide mobile three wide tablet three wide computer column">
 							<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
 							<div class="meta">{{.FullName}}</div>
 						</div>
-						<div class="ui four wide column center">
+						<div class="ui four wide column center tablet only computer only">
 							<div class="meta">
 								{{$.i18n.Tr "org.members.membership_visibility"}}
 							</div>
@@ -31,7 +31,7 @@
 								{{end}}
 							</div>
 						</div>
-						<div class="ui three wide column center">
+						<div class="five wide mobile three wide tablet three wide computer column">
 							<div class="meta">
 								{{$.i18n.Tr "org.members.member_role"}}
 							</div>
@@ -39,7 +39,7 @@
 								<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock" 16}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong>
 							</div>
 						</div>
-						<div class="ui one wide column center">
+						<div class="ui one wide column center tablet only computer only">
 							<div class="meta">
 								2FA
 							</div>
@@ -53,7 +53,7 @@
 								</strong>
 							</div>
 						</div>
-						<div class="ui three wide column">
+						<div class="ui three wide column tablet only computer only">
 							<div class="text right">
 								{{if eq $.SignedUser.ID .ID}}
 									<form method="post" action="{{$.OrgLink}}/members/action/leave">
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index bc7f5febd..cac7729cc 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -9,7 +9,7 @@
 		
 			
 			<div class="ui sixteen wide computer column list">
-				<div class="ui two column grid">
+				<div class="ui stackable two column grid">
 			{{range .Teams}}
 					<div class="column">
 						<div class="ui top attached header">
diff --git a/web_src/less/openi.less b/web_src/less/openi.less
index 8fd4b9902..229ce49e1 100644
--- a/web_src/less/openi.less
+++ b/web_src/less/openi.less
@@ -761,7 +761,7 @@ display: block;
         padding-top: 0;
         padding-bottom: 0;
     }
-    .ui.attached:not(.message)+.ui.attached.segment:not(.top){
+    .repository .ui.attached:not(.message)+.ui.attached.segment:not(.top){
         border: none;
     }
     .markdown:not(code).file-view{