diff --git a/apps/systemtags/css/settings.css b/apps/systemtags/css/settings.css
index 02713e352193e..eb1d2ad45f694 100644
--- a/apps/systemtags/css/settings.css
+++ b/apps/systemtags/css/settings.css
@@ -1,6 +1,20 @@
 .systemtag-input {
 	display: flex;
 	flex-wrap: wrap;
+	align-items: center;
+}
+.systemtag-input--name {
+	margin-right: 3px;
+}
+.systemtag-input--name,
+.systemtag-input--level {
+	display: flex;
+	flex-direction: column;
+}
+.systemtag-input--actions {
+	margin-top: 25px;
+	display: flex;
+	flex-direction: row;
 }
 #systemtags .select2-container {
 	width: 100%;
diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index 998e8628c3d4b..881172944df58 100644
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -36,17 +36,25 @@
 	<h3 id="systemtag_create"><?php p($l->t('Create a new tag')); ?></h3>
 
 	<div class="systemtag-input">
-		<input type="text" id="systemtag_name" name="systemtag_name" placeholder="<?php p($l->t('Name')); ?>">
-
-		<select id="systemtag_level">
-			<option value="3"><?php p($l->t('Public')); ?></option>
-			<option value="2"><?php p($l->t('Restricted')); ?></option>
-			<option value="0"><?php p($l->t('Invisible')); ?></option>
-		</select>
-
-		<a id="systemtag_delete" class="hidden button"><span><?php p($l->t('Delete')); ?></span></a>
-		<a id="systemtag_reset" class="button"><span><?php p($l->t('Reset')); ?></span></a>
-		<a id="systemtag_submit" class="button"><span><?php p($l->t('Create')); ?></span></a>
+		<div class="systemtag-input--name">
+			<label for="systemtag_name"><?php p($l->t('Tag name')); ?></label>
+			<input type="text" id="systemtag_name" name="systemtag_name" placeholder="<?php p($l->t('Name')); ?>">
+		</div>
+
+		<div class="systemtag-input--level">
+			<label for="systemtag_level"><?php p($l->t('Tag level')); ?></label>
+			<select id="systemtag_level">
+				<option value="3"><?php p($l->t('Public')); ?></option>
+				<option value="2"><?php p($l->t('Restricted')); ?></option>
+				<option value="0"><?php p($l->t('Invisible')); ?></option>
+			</select>
+		</div>
+
+		<div class="systemtag-input--actions">
+			<a id="systemtag_delete" class="hidden button systemtag-input--actions-button"><span><?php p($l->t('Delete')); ?></span></a>
+			<a id="systemtag_reset" class="button systemtag-input--actions-button"><span><?php p($l->t('Reset')); ?></span></a>
+			<a id="systemtag_submit" class="button systemtag-input--actions-button"><span><?php p($l->t('Create')); ?></span></a>
+		</div>
 	</div>
 
 </form>