diff --git a/views/batteriessettings.blade.php b/views/batteriessettings.blade.php
index 918be3c5..cf254f4a 100644
--- a/views/batteriessettings.blade.php
+++ b/views/batteriessettings.blade.php
@@ -12,19 +12,19 @@
 <hr class="my-2">
 
 <div class="row">
-	<div class="col-lg-6 col-12">
-		<h4 ">{{ $__t('Batteries overview') }}</h4>
+	<div class="col-lg-4 col-md-8 col-12">
+		<h4>{{ $__t('Batteries overview') }}</h4>
 
 		@include('components.numberpicker', array(
 		'id' => 'batteries_due_soon_days',
 		'additionalAttributes' => 'data-setting-key=" batteries_due_soon_days"', 'label'=> 'Due soon days',
-			'min' => 0,
-			'additionalCssClasses' => 'user-setting-control',
-			'hint' => $__t('Set to 0 to hide due soon filters/highlighting')
-			))
+		'min' => 0,
+		'additionalCssClasses' => 'user-setting-control',
+		'hint' => $__t('Set to 0 to hide due soon filters/highlighting')
+		))
 
-			<a href="{{ $U('/batteriesoverview') }}"
-				class="btn btn-success">{{ $__t('OK') }}</a>
+		<a href="{{ $U('/batteriesoverview') }}"
+			class="btn btn-success">{{ $__t('OK') }}</a>
 	</div>
 </div>
 @stop
diff --git a/views/choressettings.blade.php b/views/choressettings.blade.php
index a57edc5e..872d8628 100644
--- a/views/choressettings.blade.php
+++ b/views/choressettings.blade.php
@@ -12,7 +12,7 @@
 <hr class="my-2">
 
 <div class="row">
-	<div class="col-lg-6 col-12">
+	<div class="col-lg-4 col-md-8 col-12">
 		<h4 ">{{ $__t('Chores overview') }}</h4>
 
 		@include('components.numberpicker', array(
diff --git a/views/recipessettings.blade.php b/views/recipessettings.blade.php
index 5753b8c5..27ca4507 100644
--- a/views/recipessettings.blade.php
+++ b/views/recipessettings.blade.php
@@ -12,7 +12,7 @@
 <hr class="my-2">
 
 <div class="row">
-	<div class="col-lg-6 col-12">
+	<div class="col-lg-4 col-md-8 col-12">
 		<div class="form-group">
 			<div class="custom-control custom-checkbox">
 				<input type="checkbox"
@@ -43,7 +43,7 @@
 			</div>
 		</div>
 
-		<h4 class="mt-2">{{ $__t('Recipe card') }}</h4>
+		<h4 class="mt-5">{{ $__t('Recipe card') }}</h4>
 		<div class="form-group">
 			<div class="custom-control custom-checkbox">
 				<input type="checkbox"
diff --git a/views/shoppinglistsettings.blade.php b/views/shoppinglistsettings.blade.php
index 1d238e85..dbd06b32 100644
--- a/views/shoppinglistsettings.blade.php
+++ b/views/shoppinglistsettings.blade.php
@@ -12,8 +12,8 @@
 <hr class="my-2">
 
 <div class="row">
-	<div class="col-lg-6 col-12">
-		<h4 class="mt-2">{{ $__t('Shopping list') }}</h4>
+	<div class="col-lg-4 col-md-8 col-12">
+		<h4>{{ $__t('Shopping list') }}</h4>
 
 		<div class="form-group">
 			<div class="custom-control custom-checkbox">
@@ -65,7 +65,7 @@
 		</div>
 
 
-		<h4 class="mt-2">{{ $__t('Shopping list to stock workflow') }}</h4>
+		<h4 class="mt-5">{{ $__t('Shopping list to stock workflow') }}</h4>
 
 		<div class="form-group">
 			<div class="custom-control custom-checkbox">
diff --git a/views/stocksettings.blade.php b/views/stocksettings.blade.php
index fb3de55c..4661c799 100644
--- a/views/stocksettings.blade.php
+++ b/views/stocksettings.blade.php
@@ -12,7 +12,7 @@
 <hr class="my-2">
 
 <div class="row">
-	<div class="col-lg-6 col-12">
+	<div class="col-lg-4 col-md-8 col-12">
 		<div id="productpresets">
 			<h4>{{ $__t('Presets for new products') }}</h4>
 
@@ -91,7 +91,7 @@
 			@endif
 		</div>
 
-		<h4 class="mt-2">{{ $__t('Stock overview') }}</h4>
+		<h4 class="mt-5">{{ $__t('Stock overview') }}</h4>
 		@include('components.numberpicker', array(
 		'id' => 'stock_due_soon_days',
 		'additionalAttributes' => 'data-setting-key="stock_due_soon_days"',
@@ -130,7 +130,7 @@
 			</div>
 		</div>
 
-		<h4 class="mt-2">{{ $__t('Purchase') }}</h4>
+		<h4 class="mt-5">{{ $__t('Purchase') }}</h4>
 		@include('components.numberpicker', array(
 		'id' => 'stock_default_purchase_amount',
 		'additionalAttributes' => 'data-setting-key="stock_default_purchase_amount"',
@@ -166,7 +166,7 @@
 			</div>
 		</div>
 
-		<h4 class="mt-2">{{ $__t('Consume') }}</h4>
+		<h4 class="mt-5">{{ $__t('Consume') }}</h4>
 		@include('components.numberpicker', array(
 		'id' => 'stock_default_consume_amount',
 		'additionalAttributes' => 'data-setting-key="stock_default_consume_amount"',
@@ -190,7 +190,7 @@
 			</div>
 		</div>
 
-		<h4 class="mt-2">{{ $__t('Common') }}</h4>
+		<h4 class="mt-5">{{ $__t('Common') }}</h4>
 
 		@include('components.numberpicker', array(
 		'id' => 'stock_decimal_places_amounts',
diff --git a/views/taskssettings.blade.php b/views/taskssettings.blade.php
index 7e8460cd..846093e8 100644
--- a/views/taskssettings.blade.php
+++ b/views/taskssettings.blade.php
@@ -12,7 +12,7 @@
 <hr class="my-2">
 
 <div class="row">
-	<div class="col-lg-6 col-12">
+	<div class="col-lg-4 col-md-8 col-12">
 
 		@include('components.numberpicker', array(
 		'id' => 'tasks_due_soon_days',
diff --git a/views/usersettings.blade.php b/views/usersettings.blade.php
index a27246c5..fc7aa68f 100644
--- a/views/usersettings.blade.php
+++ b/views/usersettings.blade.php
@@ -12,7 +12,7 @@
 <hr class="my-2">
 
 <div class="row">
-	<div class="col-lg-6 col-12">
+	<div class="col-lg-4 col-md-8 col-12">
 
 		<div class="form-group">
 			<label for="locale">{{ $__t('Language') }}</label>