diff --git a/css/style.scss b/css/style.scss
index aa57a963d..eb4961204 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -157,8 +157,16 @@ input.input-inline {
 .as-sortable-un-selectable {
 	.card-list {
 		min-height: 96px;
+		flex-grow: 1;
+	}
+
+	// empty stack placeholders and last placeholders should fill the space
+	.emptyStack .as-sortable-placeholder,
+	li:last-child.as-sortable-placeholder {
+		height: 100% !important;
 	}
 }
+
 #innerBoard {
 	padding: 10px;
 
@@ -295,6 +303,8 @@ input.input-inline {
 .stack {
 	width: 100%;
 	vertical-align: top;
+	display: flex;
+	flex-direction: column;
 
 	h3 {
 		padding: 10px 10px 8px;
@@ -347,6 +357,12 @@ input.input-inline {
 		}
 	}
 
+
+	ul {
+		display: flex;
+		flex-direction: column;
+	}
+
 }
 
 
@@ -1183,13 +1199,11 @@ input.input-inline {
 
 	#innerBoard {
 		display: flex;
-		align-items: flex-start;
 	}
 
 	.stack {
 		width: 320px;
 		min-width: 320px;
-		display: inline-block;
 		border-right: 1px solid $color-lightgrey;
 		margin-right: 10px;
 		padding-right: 10px;
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 62fc18716..577112dd1 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -55,7 +55,7 @@
 						ng-if="!s.status.editStack"
                         ng-click="stackservice.delete(s.id)"></button>
 			</h3>
-			<ul data-as-sortable="sortOptions" is-disabled="!boardservice.canEdit() || params.filter==='archive'" data-ng-model="s.cards" class="card-list">
+			<ul data-as-sortable="sortOptions" is-disabled="!boardservice.canEdit() || filter==='archive'" data-ng-model="s.cards" class="card-list" ng-class="{emptyStack: !s.cards.length}">
 				<li class="card as-sortable-item"
 					ng-repeat="c in s.cards"
 					data-as-sortable-item