diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl
index c245a3bf624..31dad2c1412 100644
--- a/templates/org/settings/layout_head.tmpl
+++ b/templates/org/settings/layout_head.tmpl
@@ -1,9 +1,9 @@
 {{template "base/head" .ctxData}}
 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
 	{{template "org/header" .ctxData}}
-	<div class="ui container stackable grid">
+	<div class="ui container flex-container">
 		{{template "org/settings/navbar" .ctxData}}
-		<div class="twelve wide column">
+		<div class="flex-container-main">
 			{{template "base/alert" .ctxData}}
 			{{/* block: org-setting-content */}}
 
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
index 201ac3b9f29..64ae20f0a3b 100644
--- a/templates/org/settings/navbar.tmpl
+++ b/templates/org/settings/navbar.tmpl
@@ -1,4 +1,4 @@
-<div class="four wide column">
+<div class="flex-container-nav">
 	<div class="ui fluid vertical menu">
 		<div class="header item">{{ctx.Locale.Tr "org.settings"}}</div>
 		<a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.OrgLink}}/settings">
diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl
index 31173098318..efec9bf8742 100644
--- a/templates/repo/settings/layout_head.tmpl
+++ b/templates/repo/settings/layout_head.tmpl
@@ -1,9 +1,9 @@
 {{template "base/head" .ctxData}}
 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
 	{{template "repo/header" .ctxData}}
-	<div class="ui container stackable grid">
+	<div class="ui container flex-container">
 		{{template "repo/settings/navbar" .ctxData}}
-		<div class="twelve wide column">
+		<div class="flex-container-main">
 			{{template "base/alert" .ctxData}}
 			{{/* block: repo-setting-content */}}
 
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index 74c4b86c68e..b16eb6076fa 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -1,4 +1,4 @@
-<div class="four wide column">
+<div class="flex-container-nav">
 	<div class="ui fluid vertical menu">
 		<div class="header item">{{ctx.Locale.Tr "repo.settings"}}</div>
 		<a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.RepoLink}}/settings">