diff --git a/css/style.scss b/css/style.scss
index 2305c06c8..17ff8ff5c 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -598,31 +598,20 @@ input.input-inline {
 	.select2-container {
 		margin: 0px;
 	}
-
-	h4 {
-		border-bottom: 1px solid $color-lightgrey;
-		display: flex;
-		flex-direction: row;
-		height: 30px;
-		div:first-child {
-			flex-grow: 1;
-			padding: 15px 0 5px 0;
-			display: inline-block;
-
-		}
-	}
 	.section-header {
 		border-bottom: 1px solid $color-lightgrey;
 		display: flex;
-		flex-direction: row;
-		padding: 15px 0 5px 0;
-		margin: 10px 0 10px 0;
-
+		margin-bottom: 5px;
+		margin-top: 20px;
+		min-height: 30px;
 		h4 {
-			margin: 0;
+			padding-top: 5px;
+			padding-bottom: 5px;
 			border: none;
-			margin: 15px 0 5px 0;
+			flex: 1;
 		}
+
+
 	}
 
 	.save-indicator {
@@ -655,11 +644,6 @@ input.input-inline {
 		text-align: right;
 	}
 
-	#card-tag-label {
-		padding-top: 0px !important;
-		margin-top: 0px;
-	}
-
 	#card-description {
 		height: 100%;
 		display: flex;
@@ -998,6 +982,10 @@ input.input-inline {
 	}
 }
 
+.select2-container-multi .select2-choices {
+	padding: 0 !important;
+}
+
 .select2-container-multi .select2-choices .select2-search-choice {
 	padding: 3px 0 !important;
 	border: 0 !important;
diff --git a/templates/part.card.php b/templates/part.card.php
index 3d7f8a1e4..14e5b1fd4 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -28,9 +28,11 @@
 		<?php p($l->t('by')); ?>
 		<span>{{ cardservice.getCurrent().owner.displayname }}</span>
 	</div>
-	<h4 id="card-tag-label" ng-show="!(boardservice.isArchived() || card.archived) && card.labels">
-		<?php p($l->t('Tags')); ?>
-	</h4>
+	<div class="section-header">
+		<h4 id="card-tag-label" ng-show="!(boardservice.isArchived() || card.archived) && card.labels">
+			<?php p($l->t('Tags')); ?>
+		</h4>
+	</div>
 	<div id="labels" ng-show="!(boardservice.isArchived() || card.archived) && card.labels">
 		<ui-select multiple tagging="" ng-model="card.labels" theme="select2"
 				   ng-disabled="boardservice.isArchived() || card.archived"