diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 6f7dc09a6..1b32aa675 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -12,9 +12,9 @@
 			{{end}}
 		</h2>
 		{{template "base/alert" .}}
-		<form class="ui form stackable grid" action="{{.Link}}" method="post">
+		<form class="ui form" action="{{.Link}}" method="post">
 			{{.CsrfTokenHtml}}
-			<div class="ui seven wide column target">
+			<div class="ui seven wide target">
 				<div class="inline field {{if .Err_TagName}}error{{end}}">
 					{{if .PageIsEditRelease}}
 						<b>{{.tag_name}}</b><span class="at">@</span><strong>{{.tag_target}}</strong>
@@ -44,7 +44,7 @@
 					{{end}}
 				</div>
 			</div>
-			<div class="eleven wide column gt-pt-0">
+			<div class="eleven wide gt-pt-0">
 				<div class="field {{if .Err_Title}}error{{end}}">
 					<input name="title" aria-label="{{.locale.Tr "repo.release.title"}}" placeholder="{{.locale.Tr "repo.release.title"}}" value="{{.title}}" autofocus maxlength="255">
 				</div>
@@ -83,9 +83,9 @@
 					</div>
 				{{end}}
 			</div>
-			<div class="ui container">
-				<div class="divider"></div>
-				<div class="ui text right">
+			<div class="divider"></div>
+			<div class="ui">
+				<div>
 					{{if not .PageIsEditRelease}}
 						<div class="tag-message field">
 							<div class="ui checkbox">
@@ -103,30 +103,27 @@
 						</div>
 					</div>
 					<span class="help">{{.locale.Tr "repo.release.prerelease_helper"}}</span>
-					<div class="field">
+					<div class="divider gt-mt-0"></div>
+					<div class="gt-df gt-je">
 						{{if .PageIsEditRelease}}
-							<a class="ui button" href="{{.RepoLink}}/releases">
+							<a class="ui small button" href="{{.RepoLink}}/releases">
 								{{.locale.Tr "repo.release.cancel"}}
 							</a>
-							<a class="ui red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
+							<a class="ui small red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
 								{{$.locale.Tr "repo.release.delete_release"}}
 							</a>
 							{{if .IsDraft}}
-								<button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
-								<button class="ui primary button">
+								<button class="ui small button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
+								<button class="ui small primary button">
 									{{.locale.Tr "repo.release.publish"}}
 								</button>
 							{{else}}
-								<button class="ui primary button">
+								<button class="ui small primary button">
 									{{.locale.Tr "repo.release.edit_release"}}
 								</button>
 							{{end}}
 						{{else}}
-							{{if not .tag_name}}
-								<button class="ui button" type="submit" name="tag_only" value="{{.locale.Tr "repo.release.add_tag"}}">{{.locale.Tr "repo.release.add_tag"}}</button>
-							{{end}}
-							<button class="ui button" type="submit" name="draft" value="{{.locale.Tr "repo.release.save_draft"}}">{{.locale.Tr "repo.release.save_draft"}}</button>
-							<button class="ui primary button">
+							<button class="ui small primary button">
 								{{.locale.Tr "repo.release.publish"}}
 							</button>
 						{{end}}
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl
index 0765cb2c3..cda192454 100644
--- a/templates/repo/wiki/new.tmpl
+++ b/templates/repo/wiki/new.tmpl
@@ -6,8 +6,8 @@
 		<div class="ui header">
 			{{.locale.Tr "repo.wiki.new_page"}}
 			{{if .PageIsWikiEdit}}
-				<div class="ui right">
-					<a class="ui green small button" href="{{.RepoLink}}/wiki?action=_new">{{.locale.Tr "repo.wiki.new_page_button"}}</a>
+				<div class="ui right gt-mb-3">
+					<a class="ui green tiny button" href="{{.RepoLink}}/wiki?action=_new">{{.locale.Tr "repo.wiki.new_page_button"}}</a>
 				</div>
 			{{end}}
 		</div>
@@ -37,6 +37,7 @@
 			<div class="field gt-mt-4">
 				<input name="message" aria-label="{{.locale.Tr "repo.wiki.default_commit_message"}}" placeholder="{{.locale.Tr "repo.wiki.default_commit_message"}}">
 			</div>
+			<div class="divider"></div>
 			<div class="text right">
 				<button class="ui green button">
 					{{.locale.Tr "repo.wiki.save_page"}}
diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl
index b51193944..ec9393587 100644
--- a/templates/user/notification/notification_subscriptions.tmpl
+++ b/templates/user/notification/notification_subscriptions.tmpl
@@ -11,8 +11,8 @@
 		</div>
 		<div class="ui bottom attached active tab segment">
 			{{if eq .Status 1}}
-				<div class="ui stackable grid">
-					<div class="six wide column">
+				<div class="gt-df gt-sb">
+					<div class="gt-df">
 						<div class="small-menu-items ui compact tiny menu">
 							<a class="{{if eq .State "all"}}active {{end}}item" href="{{$.Link}}?sort={{$.SortType}}&state=all&issueType={{$.IssueType}}&labels={{$.Labels}}">
 								{{.locale.Tr "all"}}
@@ -27,8 +27,8 @@
 							</a>
 						</div>
 					</div>
-					<div class="seven wide right aligned right floated column">
-						<div class="ui right aligned secondary filter stackable menu labels">
+					<div class="gt-df gt-sb">
+						<div class="ui right aligned secondary filter menu labels">
 							<!-- Type -->
 								<div class="ui dropdown type jump item">
 									<span class="text">
diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css
index c537a7cfe..33ff2cddd 100644
--- a/web_src/css/repo/release-tag.css
+++ b/web_src/css/repo/release-tag.css
@@ -132,3 +132,7 @@
 .repository.new.release .field .attachment_edit {
   width: 450px !important;
 }
+
+.repository.new.release .markup {
+  min-height: 240px;
+}
diff --git a/web_src/css/repo/wiki.css b/web_src/css/repo/wiki.css
index b13679f61..c0a2c0ddb 100644
--- a/web_src/css/repo/wiki.css
+++ b/web_src/css/repo/wiki.css
@@ -9,6 +9,7 @@
 
 .repository.wiki .markup {
   overflow: visible;
+  min-height: 340px;
 }
 
 .repository.wiki .wiki-content-parts .markup {