diff --git a/controllers/BaseController.php b/controllers/BaseController.php
index d3054056..4219e7be 100644
--- a/controllers/BaseController.php
+++ b/controllers/BaseController.php
@@ -115,7 +115,7 @@ class BaseController
 		return UsersService::getInstance();
 	}
 
-	protected function render($response, $page, $data = [])
+	protected function render($request, $response, $page, $data = [])
 	{
 		$container = $this->AppContainer;
 
@@ -151,12 +151,22 @@ class BaseController
 			return $container->get('UrlManager')->ConstructUrl($relativePath, $isResource);
 		});
 
+		$rootLayout = 'layout.default';
 		$embedded = false;
 		if (isset($_GET['embedded']))
 		{
 			$embedded = true;
+			$accepts = $request->getHeader('Accept');
+			foreach($accepts as $accept) {
+				if(strpos($accept, "json") !== false || strpos($accept, "javascript") !== false) {
+					$rootLayout = 'layout.json';
+					break;
+				}
+			}
+
 		}
 		$this->View->set('embedded', $embedded);
+		$this->View->set('rootLayout', $rootLayout);
 
 		$constants = get_defined_constants();
 		foreach ($constants as $constant => $value)
diff --git a/controllers/BatteriesController.php b/controllers/BatteriesController.php
index 2a7eb0d4..10d29a33 100644
--- a/controllers/BatteriesController.php
+++ b/controllers/BatteriesController.php
@@ -15,7 +15,7 @@ class BatteriesController extends BaseController
 			$batteries = $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE');
 		}
 
-		return $this->renderPage($response, 'batteries', [
+		return $this->renderPage($request, $response, 'batteries', [
 			'batteries' => $batteries,
 			'userfields' => $this->getUserfieldsService()->GetFields('batteries'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('batteries')
@@ -24,21 +24,21 @@ class BatteriesController extends BaseController
 
 	public function BatteriesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'batteriessettings');
+		return $this->renderPage($request, $response, 'batteriessettings');
 	}
 
 	public function BatteryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['batteryId'] == 'new')
 		{
-			return $this->renderPage($response, 'batteryform', [
+			return $this->renderPage($request, $response, 'batteryform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('batteries')
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'batteryform', [
+			return $this->renderPage($request, $response, 'batteryform', [
 				'battery' => $this->getDatabase()->batteries($args['batteryId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('batteries')
@@ -48,7 +48,7 @@ class BatteriesController extends BaseController
 
 	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'batteriesjournal', [
+		return $this->renderPage($request, $response, 'batteriesjournal', [
 			'chargeCycles' => $this->getDatabase()->battery_charge_cycles()->orderBy('tracked_time', 'DESC'),
 			'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE')
 		]);
@@ -59,7 +59,7 @@ class BatteriesController extends BaseController
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days'];
 
-		return $this->renderPage($response, 'batteriesoverview', [
+		return $this->renderPage($request, $response, 'batteriesoverview', [
 			'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'current' => $this->getBatteriesService()->GetCurrent(),
 			'nextXDays' => $nextXDays,
@@ -70,7 +70,7 @@ class BatteriesController extends BaseController
 
 	public function TrackChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'batterytracking', [
+		return $this->renderPage($request, $response, 'batterytracking', [
 			'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE')
 		]);
 	}
diff --git a/controllers/CalendarController.php b/controllers/CalendarController.php
index 1eb88282..8b6ecc72 100644
--- a/controllers/CalendarController.php
+++ b/controllers/CalendarController.php
@@ -6,7 +6,7 @@ class CalendarController extends BaseController
 {
 	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'calendar', [
+		return $this->renderPage($request, $response, 'calendar', [
 			'fullcalendarEventSources' => $this->getCalendarService()->GetEvents()
 		]);
 	}
diff --git a/controllers/ChoresController.php b/controllers/ChoresController.php
index 403e8e9d..a5eaa7e4 100644
--- a/controllers/ChoresController.php
+++ b/controllers/ChoresController.php
@@ -11,7 +11,7 @@ class ChoresController extends BaseController
 
 		if ($args['choreId'] == 'new')
 		{
-			return $this->renderPage($response, 'choreform', [
+			return $this->renderPage($request, $response, 'choreform', [
 				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('chores'),
@@ -22,7 +22,7 @@ class ChoresController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'choreform', [
+			return $this->renderPage($request, $response, 'choreform', [
 				'chore' => $this->getDatabase()->chores($args['choreId']),
 				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService', 'CHORE_PERIOD_TYPE_'),
 				'mode' => 'edit',
@@ -45,7 +45,7 @@ class ChoresController extends BaseController
 			$chores = $this->getDatabase()->chores()->where('active = 1')->orderBy('name', 'COLLATE NOCASE');
 		}
 
-		return $this->renderPage($response, 'chores', [
+		return $this->renderPage($request, $response, 'chores', [
 			'chores' => $chores,
 			'userfields' => $this->getUserfieldsService()->GetFields('chores'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('chores')
@@ -54,12 +54,12 @@ class ChoresController extends BaseController
 
 	public function ChoresSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'choressettings');
+		return $this->renderPage($request, $response, 'choressettings');
 	}
 
 	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'choresjournal', [
+		return $this->renderPage($request, $response, 'choresjournal', [
 			'choresLog' => $this->getDatabase()->chores_log()->orderBy('tracked_time', 'DESC'),
 			'chores' => $this->getDatabase()->chores()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'users' => $this->getDatabase()->users()->orderBy('username')
@@ -71,7 +71,7 @@ class ChoresController extends BaseController
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days'];
 
-		return $this->renderPage($response, 'choresoverview', [
+		return $this->renderPage($request, $response, 'choresoverview', [
 			'chores' => $this->getDatabase()->chores()->orderBy('name', 'COLLATE NOCASE'),
 			'currentChores' => $this->getChoresService()->GetCurrent(),
 			'nextXDays' => $nextXDays,
@@ -83,7 +83,7 @@ class ChoresController extends BaseController
 
 	public function TrackChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'choretracking', [
+		return $this->renderPage($request, $response, 'choretracking', [
 			'chores' => $this->getDatabase()->chores()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
diff --git a/controllers/EquipmentController.php b/controllers/EquipmentController.php
index e64db7c6..f26f8a1d 100644
--- a/controllers/EquipmentController.php
+++ b/controllers/EquipmentController.php
@@ -10,14 +10,14 @@ class EquipmentController extends BaseController
 	{
 		if ($args['equipmentId'] == 'new')
 		{
-			return $this->renderPage($response, 'equipmentform', [
+			return $this->renderPage($request, $response, 'equipmentform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('equipment')
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'equipmentform', [
+			return $this->renderPage($request, $response, 'equipmentform', [
 				'equipment' => $this->getDatabase()->equipment($args['equipmentId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('equipment')
@@ -27,7 +27,7 @@ class EquipmentController extends BaseController
 
 	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'equipment', [
+		return $this->renderPage($request, $response, 'equipment', [
 			'equipment' => $this->getDatabase()->equipment()->orderBy('name', 'COLLATE NOCASE'),
 			'userfields' => $this->getUserfieldsService()->GetFields('equipment'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('equipment')
diff --git a/controllers/ExceptionController.php b/controllers/ExceptionController.php
index cf21dc7c..d61ccbd8 100644
--- a/controllers/ExceptionController.php
+++ b/controllers/ExceptionController.php
@@ -61,19 +61,19 @@ class ExceptionController extends BaseApiController
 		{
 			define('GROCY_AUTHENTICATED', false);
 
-			return $this->renderPage($response->withStatus(404), 'errors/404', [
+			return $this->renderPage($request, $response->withStatus(404), 'errors/404', [
 				'exception' => $exception
 			]);
 		}
 
 		if ($exception instanceof HttpForbiddenException)
 		{
-			return $this->renderPage($response->withStatus(403), 'errors/403', [
+			return $this->renderPage($request, $response->withStatus(403), 'errors/403', [
 				'exception' => $exception
 			]);
 		}
 
-		return $this->renderPage($response->withStatus(500), 'errors/500', [
+		return $this->renderPage($request, $response->withStatus(500), 'errors/500', [
 			'exception' => $exception
 		]);
 	}
diff --git a/controllers/GenericEntityController.php b/controllers/GenericEntityController.php
index 7b18cb56..c53d6278 100644
--- a/controllers/GenericEntityController.php
+++ b/controllers/GenericEntityController.php
@@ -6,7 +6,7 @@ class GenericEntityController extends BaseController
 {
 	public function UserentitiesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'userentities', [
+		return $this->renderPage($request, $response, 'userentities', [
 			'userentities' => $this->getDatabase()->userentities()->orderBy('name', 'COLLATE NOCASE')
 		]);
 	}
@@ -15,13 +15,13 @@ class GenericEntityController extends BaseController
 	{
 		if ($args['userentityId'] == 'new')
 		{
-			return $this->renderPage($response, 'userentityform', [
+			return $this->renderPage($request, $response, 'userentityform', [
 				'mode' => 'create'
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'userentityform', [
+			return $this->renderPage($request, $response, 'userentityform', [
 				'mode' => 'edit',
 				'userentity' => $this->getDatabase()->userentities($args['userentityId'])
 			]);
@@ -32,7 +32,7 @@ class GenericEntityController extends BaseController
 	{
 		if ($args['userfieldId'] == 'new')
 		{
-			return $this->renderPage($response, 'userfieldform', [
+			return $this->renderPage($request, $response, 'userfieldform', [
 				'mode' => 'create',
 				'userfieldTypes' => $this->getUserfieldsService()->GetFieldTypes(),
 				'entities' => $this->getUserfieldsService()->GetEntities()
@@ -40,7 +40,7 @@ class GenericEntityController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'userfieldform', [
+			return $this->renderPage($request, $response, 'userfieldform', [
 				'mode' => 'edit',
 				'userfield' => $this->getUserfieldsService()->GetField($args['userfieldId']),
 				'userfieldTypes' => $this->getUserfieldsService()->GetFieldTypes(),
@@ -51,7 +51,7 @@ class GenericEntityController extends BaseController
 
 	public function UserfieldsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'userfields', [
+		return $this->renderPage($request, $response, 'userfields', [
 			'userfields' => $this->getUserfieldsService()->GetAllFields(),
 			'entities' => $this->getUserfieldsService()->GetEntities()
 		]);
@@ -63,7 +63,7 @@ class GenericEntityController extends BaseController
 
 		if ($args['userobjectId'] == 'new')
 		{
-			return $this->renderPage($response, 'userobjectform', [
+			return $this->renderPage($request, $response, 'userobjectform', [
 				'userentity' => $userentity,
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName'])
@@ -71,7 +71,7 @@ class GenericEntityController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'userobjectform', [
+			return $this->renderPage($request, $response, 'userobjectform', [
 				'userentity' => $userentity,
 				'mode' => 'edit',
 				'userobject' => $this->getDatabase()->userobjects($args['userobjectId']),
@@ -84,7 +84,7 @@ class GenericEntityController extends BaseController
 	{
 		$userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch();
 
-		return $this->renderPage($response, 'userobjects', [
+		return $this->renderPage($request, $response, 'userobjects', [
 			'userentity' => $userentity,
 			'userobjects' => $this->getDatabase()->userobjects()->where('userentity_id = :1', $userentity->id),
 			'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName']),
diff --git a/controllers/LoginController.php b/controllers/LoginController.php
index 1182e2cc..981ca73e 100644
--- a/controllers/LoginController.php
+++ b/controllers/LoginController.php
@@ -13,7 +13,7 @@ class LoginController extends BaseController
 
 	public function LoginPage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'login');
+		return $this->renderPage($request, $response, 'login');
 	}
 
 	public function Logout(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
diff --git a/controllers/OpenApiController.php b/controllers/OpenApiController.php
index 63716ce5..e3c35159 100644
--- a/controllers/OpenApiController.php
+++ b/controllers/OpenApiController.php
@@ -13,7 +13,7 @@ class OpenApiController extends BaseApiController
 		{
 			$apiKeys = $apiKeys->where('user_id', GROCY_USER_ID);
 		}
-		return $this->renderPage($response, 'manageapikeys', [
+		return $this->renderPage($request, $response, 'manageapikeys', [
 			'apiKeys' => $apiKeys,
 			'users' => $this->getDatabase()->users()
 		]);
diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php
index ab999565..40b01e5b 100644
--- a/controllers/RecipesController.php
+++ b/controllers/RecipesController.php
@@ -41,7 +41,7 @@ class RecipesController extends BaseController
 			];
 		}
 
-		return $this->renderPage($response, 'mealplan', [
+		return $this->renderPage($request, $response, 'mealplan', [
 			'fullcalendarEventSources' => $events,
 			'recipes' => $recipes,
 			'internalRecipes' => $this->getDatabase()->recipes()->whereNot('type', RecipesService::RECIPE_TYPE_NORMAL)->fetchAll(),
@@ -127,14 +127,14 @@ class RecipesController extends BaseController
 			$renderArray['allRecipePositions'] = $allRecipePositions;
 		}
 
-		return $this->renderPage($response, 'recipes', $renderArray);
+		return $this->renderPage($request, $response, 'recipes', $renderArray);
 	}
 
 	public function RecipeEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$recipeId = $args['recipeId'];
 
-		return $this->renderPage($response, 'recipeform', [
+		return $this->renderPage($request, $response, 'recipeform', [
 			'recipe' => $this->getDatabase()->recipes($recipeId),
 			'recipePositions' => $this->getDatabase()->recipes_pos()->where('recipe_id', $recipeId),
 			'mode' => $recipeId == 'new' ? 'create' : 'edit',
@@ -153,7 +153,7 @@ class RecipesController extends BaseController
 	{
 		if ($args['recipePosId'] == 'new')
 		{
-			return $this->renderPage($response, 'recipeposform', [
+			return $this->renderPage($request, $response, 'recipeposform', [
 				'mode' => 'create',
 				'recipe' => $this->getDatabase()->recipes($args['recipeId']),
 				'recipePos' => new \stdClass(),
@@ -164,7 +164,7 @@ class RecipesController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'recipeposform', [
+			return $this->renderPage($request, $response, 'recipeposform', [
 				'mode' => 'edit',
 				'recipe' => $this->getDatabase()->recipes($args['recipeId']),
 				'recipePos' => $this->getDatabase()->recipes_pos($args['recipePosId']),
@@ -177,7 +177,7 @@ class RecipesController extends BaseController
 
 	public function RecipesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'recipessettings');
+		return $this->renderPage($request, $response, 'recipessettings');
 	}
 
 	public function __construct(\DI\Container $container)
diff --git a/controllers/StockController.php b/controllers/StockController.php
index 25a5c2af..58589d88 100644
--- a/controllers/StockController.php
+++ b/controllers/StockController.php
@@ -10,7 +10,7 @@ class StockController extends BaseController
 {
 	public function Consume(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'consume', [
+		return $this->renderPage($request, $response, 'consume', [
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name'),
 			'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 			'recipes' => $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name', 'COLLATE NOCASE'),
@@ -22,7 +22,7 @@ class StockController extends BaseController
 
 	public function Inventory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'inventory', [
+		return $this->renderPage($request, $response, 'inventory', [
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
@@ -36,7 +36,7 @@ class StockController extends BaseController
 	{
 		$usersService = $this->getUsersService();
 
-		return $this->renderPage($response, 'stockjournal', [
+		return $this->renderPage($request, $response, 'stockjournal', [
 			'stockLog' => $this->getDatabase()->uihelper_stock_journal()->orderBy('row_created_timestamp', 'DESC'),
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
@@ -47,7 +47,7 @@ class StockController extends BaseController
 
 	public function LocationContentSheet(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'locationcontentsheet', [
+		return $this->renderPage($request, $response, 'locationcontentsheet', [
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
@@ -59,14 +59,14 @@ class StockController extends BaseController
 	{
 		if ($args['locationId'] == 'new')
 		{
-			return $this->renderPage($response, 'locationform', [
+			return $this->renderPage($request, $response, 'locationform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('locations')
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'locationform', [
+			return $this->renderPage($request, $response, 'locationform', [
 				'location' => $this->getDatabase()->locations($args['locationId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('locations')
@@ -76,7 +76,7 @@ class StockController extends BaseController
 
 	public function LocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'locations', [
+		return $this->renderPage($request, $response, 'locations', [
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'userfields' => $this->getUserfieldsService()->GetFields('locations'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('locations')
@@ -88,7 +88,7 @@ class StockController extends BaseController
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_due_soon_days'];
 
-		return $this->renderPage($response, 'stockoverview', [
+		return $this->renderPage($request, $response, 'stockoverview', [
 			'currentStock' => $this->getStockService()->GetCurrentStockOverview(),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'currentStockLocations' => $this->getStockService()->GetCurrentStockLocations(),
@@ -110,7 +110,7 @@ class StockController extends BaseController
 
 		if ($args['productBarcodeId'] == 'new')
 		{
-			return $this->renderPage($response, 'productbarcodeform', [
+			return $this->renderPage($request, $response, 'productbarcodeform', [
 				'mode' => 'create',
 				'barcodes' => $this->getDatabase()->product_barcodes()->orderBy('barcode'),
 				'product' => $product,
@@ -122,7 +122,7 @@ class StockController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'productbarcodeform', [
+			return $this->renderPage($request, $response, 'productbarcodeform', [
 				'mode' => 'edit',
 				'barcode' => $this->getDatabase()->product_barcodes($args['productBarcodeId']),
 				'product' => $product,
@@ -138,7 +138,7 @@ class StockController extends BaseController
 	{
 		if ($args['productId'] == 'new')
 		{
-			return $this->renderPage($response, 'productform', [
+			return $this->renderPage($request, $response, 'productform', [
 				'locations' => $this->getDatabase()->locations()->orderBy('name'),
 				'barcodes' => $this->getDatabase()->product_barcodes()->orderBy('barcode'),
 				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
@@ -154,7 +154,7 @@ class StockController extends BaseController
 		{
 			$product = $this->getDatabase()->products($args['productId']);
 
-			return $this->renderPage($response, 'productform', [
+			return $this->renderPage($request, $response, 'productform', [
 				'product' => $product,
 				'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 				'barcodes' => $this->getDatabase()->product_barcodes()->orderBy('barcode'),
@@ -208,14 +208,14 @@ class StockController extends BaseController
 	{
 		if ($args['productGroupId'] == 'new')
 		{
-			return $this->renderPage($response, 'productgroupform', [
+			return $this->renderPage($request, $response, 'productgroupform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('product_groups')
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'productgroupform', [
+			return $this->renderPage($request, $response, 'productgroupform', [
 				'group' => $this->getDatabase()->product_groups($args['productGroupId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('product_groups')
@@ -225,7 +225,7 @@ class StockController extends BaseController
 
 	public function ProductGroupsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'productgroups', [
+		return $this->renderPage($request, $response, 'productgroups', [
 			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name', 'COLLATE NOCASE'),
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'userfields' => $this->getUserfieldsService()->GetFields('product_groups'),
@@ -244,7 +244,7 @@ class StockController extends BaseController
 			$products = $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE');
 		}
 
-		return $this->renderPage($response, 'products', [
+		return $this->renderPage($request, $response, 'products', [
 			'products' => $products,
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
@@ -257,7 +257,7 @@ class StockController extends BaseController
 
 	public function Purchase(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'purchase', [
+		return $this->renderPage($request, $response, 'purchase', [
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
@@ -285,7 +285,7 @@ class StockController extends BaseController
 
 		if ($args['quConversionId'] == 'new')
 		{
-			return $this->renderPage($response, 'quantityunitconversionform', [
+			return $this->renderPage($request, $response, 'quantityunitconversionform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('quantity_unit_conversions'),
 				'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
@@ -295,7 +295,7 @@ class StockController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'quantityunitconversionform', [
+			return $this->renderPage($request, $response, 'quantityunitconversionform', [
 				'quConversion' => $this->getDatabase()->quantity_unit_conversions($args['quConversionId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('quantity_unit_conversions'),
@@ -310,7 +310,7 @@ class StockController extends BaseController
 	{
 		if ($args['quantityunitId'] == 'new')
 		{
-			return $this->renderPage($response, 'quantityunitform', [
+			return $this->renderPage($request, $response, 'quantityunitform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
 				'pluralCount' => $this->getLocalizationService()->GetPluralCount(),
@@ -321,7 +321,7 @@ class StockController extends BaseController
 		{
 			$quantityUnit = $this->getDatabase()->quantity_units($args['quantityunitId']);
 
-			return $this->renderPage($response, 'quantityunitform', [
+			return $this->renderPage($request, $response, 'quantityunitform', [
 				'quantityUnit' => $quantityUnit,
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
@@ -335,14 +335,14 @@ class StockController extends BaseController
 
 	public function QuantityUnitPluralFormTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'quantityunitpluraltesting', [
+		return $this->renderPage($request, $response, 'quantityunitpluraltesting', [
 			'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE')
 		]);
 	}
 
 	public function QuantityUnitsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'quantityunits', [
+		return $this->renderPage($request, $response, 'quantityunits', [
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
 			'userfields' => $this->getUserfieldsService()->GetFields('quantity_units'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('quantity_units')
@@ -358,7 +358,7 @@ class StockController extends BaseController
 			$listId = $request->getQueryParams()['list'];
 		}
 
-		return $this->renderPage($response, 'shoppinglist', [
+		return $this->renderPage($request, $response, 'shoppinglist', [
 			'listItems' => $this->getDatabase()->uihelper_shopping_list()->where('shopping_list_id = :1', $listId),
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
@@ -377,14 +377,14 @@ class StockController extends BaseController
 	{
 		if ($args['listId'] == 'new')
 		{
-			return $this->renderPage($response, 'shoppinglistform', [
+			return $this->renderPage($request, $response, 'shoppinglistform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('shopping_lists')
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'shoppinglistform', [
+			return $this->renderPage($request, $response, 'shoppinglistform', [
 				'shoppingList' => $this->getDatabase()->shopping_lists($args['listId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('shopping_lists')
@@ -396,7 +396,7 @@ class StockController extends BaseController
 	{
 		if ($args['itemId'] == 'new')
 		{
-			return $this->renderPage($response, 'shoppinglistitemform', [
+			return $this->renderPage($request, $response, 'shoppinglistitemform', [
 				'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name', 'COLLATE NOCASE'),
 				'mode' => 'create',
@@ -407,7 +407,7 @@ class StockController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'shoppinglistitemform', [
+			return $this->renderPage($request, $response, 'shoppinglistitemform', [
 				'listItem' => $this->getDatabase()->shopping_list($args['itemId']),
 				'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 				'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name', 'COLLATE NOCASE'),
@@ -421,21 +421,21 @@ class StockController extends BaseController
 
 	public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'shoppinglistsettings');
+		return $this->renderPage($request, $response, 'shoppinglistsettings');
 	}
 
 	public function ShoppingLocationEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		if ($args['shoppingLocationId'] == 'new')
 		{
-			return $this->renderPage($response, 'shoppinglocationform', [
+			return $this->renderPage($request, $response, 'shoppinglocationform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('shopping_locations')
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'shoppinglocationform', [
+			return $this->renderPage($request, $response, 'shoppinglocationform', [
 				'shoppinglocation' => $this->getDatabase()->shopping_locations($args['shoppingLocationId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('shopping_locations')
@@ -445,7 +445,7 @@ class StockController extends BaseController
 
 	public function ShoppingLocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'shoppinglocations', [
+		return $this->renderPage($request, $response, 'shoppinglocations', [
 			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
 			'userfields' => $this->getUserfieldsService()->GetFields('shopping_locations'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('shopping_locations')
@@ -454,7 +454,7 @@ class StockController extends BaseController
 
 	public function StockEntryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'stockentryform', [
+		return $this->renderPage($request, $response, 'stockentryform', [
 			'stockEntry' => $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(),
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'),
@@ -497,7 +497,7 @@ class StockController extends BaseController
 	public function StockEntryGrocycodeLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		$stockEntry = $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch();
-		return $this->renderPage($response, 'stockentrylabel', [
+		return $this->renderPage($request, $response, 'stockentrylabel', [
 			'stockEntry' => $stockEntry,
 			'product' => $this->getDatabase()->products($stockEntry->product_id),
 		]);
@@ -505,7 +505,7 @@ class StockController extends BaseController
 
 	public function StockSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'stocksettings', [
+		return $this->renderPage($request, $response, 'stocksettings', [
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
 			'productGroups' => $this->getDatabase()->product_groups()->orderBy('name', 'COLLATE NOCASE')
@@ -518,7 +518,7 @@ class StockController extends BaseController
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_due_soon_days'];
 
-		return $this->renderPage($response, 'stockentries', [
+		return $this->renderPage($request, $response, 'stockentries', [
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
@@ -533,7 +533,7 @@ class StockController extends BaseController
 
 	public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'transfer', [
+		return $this->renderPage($request, $response, 'transfer', [
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'barcodes' => $this->getDatabase()->product_barcodes_comma_separated(),
 			'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'),
@@ -564,7 +564,7 @@ class StockController extends BaseController
 		}
 
 		$usersService = $this->getUsersService();
-		return $this->renderPage($response, 'stockjournalsummary', [
+		return $this->renderPage($request, $response, 'stockjournalsummary', [
 			'entries' => $entries,
 			'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
 			'users' => $usersService->GetUsersAsDto(),
diff --git a/controllers/SystemController.php b/controllers/SystemController.php
index b358c90d..2018904a 100644
--- a/controllers/SystemController.php
+++ b/controllers/SystemController.php
@@ -9,7 +9,7 @@ class SystemController extends BaseController
 {
 	public function About(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'about', [
+		return $this->renderPage($request, $response, 'about', [
 			'system_info' => $this->getApplicationService()->GetSystemInfo(),
 			'changelog' => $this->getApplicationService()->GetChangelog()
 		]);
@@ -17,7 +17,7 @@ class SystemController extends BaseController
 
 	public function BarcodeScannerTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'barcodescannertesting');
+		return $this->renderPage($request, $response, 'barcodescannertesting');
 	}
 
 	public function Root(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
diff --git a/controllers/TasksController.php b/controllers/TasksController.php
index 7adca972..7001a4ac 100644
--- a/controllers/TasksController.php
+++ b/controllers/TasksController.php
@@ -18,7 +18,7 @@ class TasksController extends BaseController
 		$usersService = $this->getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days'];
 
-		return $this->renderPage($response, 'tasks', [
+		return $this->renderPage($request, $response, 'tasks', [
 			'tasks' => $tasks,
 			'nextXDays' => $nextXDays,
 			'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name', 'COLLATE NOCASE'),
@@ -30,7 +30,7 @@ class TasksController extends BaseController
 
 	public function TaskCategoriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'taskcategories', [
+		return $this->renderPage($request, $response, 'taskcategories', [
 			'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name', 'COLLATE NOCASE'),
 			'userfields' => $this->getUserfieldsService()->GetFields('task_categories'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('task_categories')
@@ -41,14 +41,14 @@ class TasksController extends BaseController
 	{
 		if ($args['categoryId'] == 'new')
 		{
-			return $this->renderPage($response, 'taskcategoryform', [
+			return $this->renderPage($request, $response, 'taskcategoryform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('task_categories')
 			]);
 		}
 		else
 		{
-			return $this->renderPage($response, 'taskcategoryform', [
+			return $this->renderPage($request, $response, 'taskcategoryform', [
 				'category' => $this->getDatabase()->task_categories($args['categoryId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('task_categories')
@@ -60,7 +60,7 @@ class TasksController extends BaseController
 	{
 		if ($args['taskId'] == 'new')
 		{
-			return $this->renderPage($response, 'taskform', [
+			return $this->renderPage($request, $response, 'taskform', [
 				'mode' => 'create',
 				'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name', 'COLLATE NOCASE'),
 				'users' => $this->getDatabase()->users()->orderBy('username'),
@@ -69,7 +69,7 @@ class TasksController extends BaseController
 		}
 		else
 		{
-			return $this->renderPage($response, 'taskform', [
+			return $this->renderPage($request, $response, 'taskform', [
 				'task' => $this->getDatabase()->tasks($args['taskId']),
 				'mode' => 'edit',
 				'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name', 'COLLATE NOCASE'),
@@ -81,7 +81,7 @@ class TasksController extends BaseController
 
 	public function TasksSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'taskssettings');
+		return $this->renderPage($request, $response, 'taskssettings');
 	}
 
 	public function __construct(\DI\Container $container)
diff --git a/controllers/UsersController.php b/controllers/UsersController.php
index 0037f7e5..bbd112c8 100644
--- a/controllers/UsersController.php
+++ b/controllers/UsersController.php
@@ -9,7 +9,7 @@ class UsersController extends BaseController
 	public function PermissionList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		User::checkPermission($request, User::PERMISSION_USERS_READ);
-		return $this->renderPage($response, 'userpermissions', [
+		return $this->renderPage($request, $response, 'userpermissions', [
 			'user' => $this->getDatabase()->users($args['userId']),
 			'permissions' => $this->getDatabase()->uihelper_user_permissions()
 				->where('parent IS NULL')->where('user_id', $args['userId'])
@@ -21,7 +21,7 @@ class UsersController extends BaseController
 		if ($args['userId'] == 'new')
 		{
 			User::checkPermission($request, User::PERMISSION_USERS_CREATE);
-			return $this->renderPage($response, 'userform', [
+			return $this->renderPage($request, $response, 'userform', [
 				'mode' => 'create',
 				'userfields' => $this->getUserfieldsService()->GetFields('users')
 			]);
@@ -37,7 +37,7 @@ class UsersController extends BaseController
 				User::checkPermission($request, User::PERMISSION_USERS_EDIT);
 			}
 
-			return $this->renderPage($response, 'userform', [
+			return $this->renderPage($request, $response, 'userform', [
 				'user' => $this->getDatabase()->users($args['userId']),
 				'mode' => 'edit',
 				'userfields' => $this->getUserfieldsService()->GetFields('users'),
@@ -48,7 +48,7 @@ class UsersController extends BaseController
 
 	public function UserSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		return $this->renderPage($response, 'usersettings', [
+		return $this->renderPage($request, $response, 'usersettings', [
 			'languages' => array_filter(scandir(__DIR__ . '/../localization'), function ($item) {
 				if ($item == '.' || $item == '..')
 				{
@@ -63,7 +63,7 @@ class UsersController extends BaseController
 	public function UsersList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		User::checkPermission($request, User::PERMISSION_USERS_READ);
-		return $this->renderPage($response, 'users', [
+		return $this->renderPage($request, $response, 'users', [
 			'users' => $this->getDatabase()->users()->orderBy('username'),
 			'userfields' => $this->getUserfieldsService()->GetFields('users'),
 			'userfieldValues' => $this->getUserfieldsService()->GetAllValues('users')
diff --git a/views/about.blade.php b/views/about.blade.php
index 30aa8fff..45ccdd22 100644
--- a/views/about.blade.php
+++ b/views/about.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('About grocy'))
 @section('viewJsName', 'about')
diff --git a/views/barcodescannertesting.blade.php b/views/barcodescannertesting.blade.php
index 28fd05a3..441c0412 100644
--- a/views/barcodescannertesting.blade.php
+++ b/views/barcodescannertesting.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Barcode scanner testing'))
 
diff --git a/views/batteries.blade.php b/views/batteries.blade.php
index 551984cb..649cecdb 100644
--- a/views/batteries.blade.php
+++ b/views/batteries.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Batteries'))
 @section('activeNav', 'batteries')
diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php
index 0e96eacb..64fd6441 100644
--- a/views/batteriesjournal.blade.php
+++ b/views/batteriesjournal.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Batteries journal'))
 @section('activeNav', 'batteriesjournal')
diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php
index a045a772..d6f43e80 100644
--- a/views/batteriesoverview.blade.php
+++ b/views/batteriesoverview.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Batteries overview'))
 @section('activeNav', 'batteriesoverview')
diff --git a/views/batteriessettings.blade.php b/views/batteriessettings.blade.php
index a9c4838a..b6afeb01 100644
--- a/views/batteriessettings.blade.php
+++ b/views/batteriessettings.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Batteries settings'))
 
diff --git a/views/batteryform.blade.php b/views/batteryform.blade.php
index a7dbe1f7..176b2328 100644
--- a/views/batteryform.blade.php
+++ b/views/batteryform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit battery'))
diff --git a/views/batterytracking.blade.php b/views/batterytracking.blade.php
index 81bedba5..79696f21 100644
--- a/views/batterytracking.blade.php
+++ b/views/batterytracking.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Battery tracking'))
 @section('activeNav', 'batterytracking')
diff --git a/views/calendar.blade.php b/views/calendar.blade.php
index a3d2b257..23839ab1 100644
--- a/views/calendar.blade.php
+++ b/views/calendar.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Calendar'))
 @section('activeNav', 'calendar')
diff --git a/views/choreform.blade.php b/views/choreform.blade.php
index df7a9d51..8aabeeca 100644
--- a/views/choreform.blade.php
+++ b/views/choreform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit chore'))
diff --git a/views/chores.blade.php b/views/chores.blade.php
index f85f02bb..cf70eff5 100644
--- a/views/chores.blade.php
+++ b/views/chores.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Chores'))
 @section('activeNav', 'chores')
diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php
index 717783fc..c5eada22 100644
--- a/views/choresjournal.blade.php
+++ b/views/choresjournal.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Chores journal'))
 @section('activeNav', 'choresjournal')
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index 7d21d29a..61e14b74 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Chores overview'))
 @section('activeNav', 'choresoverview')
diff --git a/views/choressettings.blade.php b/views/choressettings.blade.php
index 70eac032..859ae8d3 100644
--- a/views/choressettings.blade.php
+++ b/views/choressettings.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Chores settings'))
 
diff --git a/views/choretracking.blade.php b/views/choretracking.blade.php
index 7c68fa08..f4aeb092 100644
--- a/views/choretracking.blade.php
+++ b/views/choretracking.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Chore tracking'))
 @section('activeNav', 'choretracking')
diff --git a/views/consume.blade.php b/views/consume.blade.php
index 62d1aac6..3e6c2a4d 100644
--- a/views/consume.blade.php
+++ b/views/consume.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Consume'))
 @section('activeNav', 'consume')
diff --git a/views/equipment.blade.php b/views/equipment.blade.php
index ae0067bf..6afa8528 100644
--- a/views/equipment.blade.php
+++ b/views/equipment.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Equipment'))
 @section('activeNav', 'equipment')
diff --git a/views/equipmentform.blade.php b/views/equipmentform.blade.php
index da674860..07782e74 100644
--- a/views/equipmentform.blade.php
+++ b/views/equipmentform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit equipment'))
diff --git a/views/errors/base.blade.php b/views/errors/base.blade.php
index 6e551f69..4f618371 100644
--- a/views/errors/base.blade.php
+++ b/views/errors/base.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('content')
 <div class="row">
diff --git a/views/inventory.blade.php b/views/inventory.blade.php
index 114c05db..baf77e4c 100644
--- a/views/inventory.blade.php
+++ b/views/inventory.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Inventory'))
 @section('activeNav', 'inventory')
diff --git a/views/locationcontentsheet.blade.php b/views/locationcontentsheet.blade.php
index 4c2c874b..9ae93958 100644
--- a/views/locationcontentsheet.blade.php
+++ b/views/locationcontentsheet.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Location Content Sheet'))
 @section('viewJsName', 'locationcontentsheet')
diff --git a/views/locationform.blade.php b/views/locationform.blade.php
index 21d68564..e6ac51d8 100644
--- a/views/locationform.blade.php
+++ b/views/locationform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit location'))
diff --git a/views/locations.blade.php b/views/locations.blade.php
index c71b7c3d..51f8465c 100644
--- a/views/locations.blade.php
+++ b/views/locations.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Locations'))
 @section('activeNav', 'locations')
diff --git a/views/login.blade.php b/views/login.blade.php
index 0ddc9c68..11e4b590 100644
--- a/views/login.blade.php
+++ b/views/login.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Login'))
 @section('viewJsName', 'login')
diff --git a/views/manageapikeys.blade.php b/views/manageapikeys.blade.php
index 13bcebf3..3323ec19 100644
--- a/views/manageapikeys.blade.php
+++ b/views/manageapikeys.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('API keys'))
 @section('activeNav', '')
diff --git a/views/mealplan.blade.php b/views/mealplan.blade.php
index 7b01cb4b..359a1de0 100644
--- a/views/mealplan.blade.php
+++ b/views/mealplan.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Meal plan'))
 @section('activeNav', 'mealplan')
diff --git a/views/productbarcodeform.blade.php b/views/productbarcodeform.blade.php
index e2261f14..fe0d4d32 100644
--- a/views/productbarcodeform.blade.php
+++ b/views/productbarcodeform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit Barcode'))
diff --git a/views/productform.blade.php b/views/productform.blade.php
index b8807060..000c9e76 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit product'))
diff --git a/views/productgroupform.blade.php b/views/productgroupform.blade.php
index fb0eb7ee..a00e5392 100644
--- a/views/productgroupform.blade.php
+++ b/views/productgroupform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit product group'))
diff --git a/views/productgroups.blade.php b/views/productgroups.blade.php
index 53c9de16..88ec1da5 100644
--- a/views/productgroups.blade.php
+++ b/views/productgroups.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Product groups'))
 @section('activeNav', 'productgroups')
diff --git a/views/products.blade.php b/views/products.blade.php
index 22283303..798ad758 100644
--- a/views/products.blade.php
+++ b/views/products.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Products'))
 @section('activeNav', 'products')
diff --git a/views/purchase.blade.php b/views/purchase.blade.php
index a271a1dc..2820ce8e 100644
--- a/views/purchase.blade.php
+++ b/views/purchase.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Purchase'))
 @section('activeNav', 'purchase')
diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php
index bf8c35a5..70aa9df2 100644
--- a/views/quantityunitconversionform.blade.php
+++ b/views/quantityunitconversionform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit QU conversion'))
diff --git a/views/quantityunitform.blade.php b/views/quantityunitform.blade.php
index f2deacf1..41ea0776 100644
--- a/views/quantityunitform.blade.php
+++ b/views/quantityunitform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit quantity unit'))
diff --git a/views/quantityunitpluraltesting.blade.php b/views/quantityunitpluraltesting.blade.php
index 8a8d384e..21880d7f 100644
--- a/views/quantityunitpluraltesting.blade.php
+++ b/views/quantityunitpluraltesting.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Quantity unit plural form testing'))
 
diff --git a/views/quantityunits.blade.php b/views/quantityunits.blade.php
index 8386c97d..b4032ed1 100644
--- a/views/quantityunits.blade.php
+++ b/views/quantityunits.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Quantity units'))
 @section('activeNav', 'quantityunits')
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index db581039..35afb1f9 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit recipe'))
diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php
index be45e4f3..e30b6cca 100644
--- a/views/recipeposform.blade.php
+++ b/views/recipeposform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit recipe ingredient'))
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 2af2f664..d48300c2 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Recipes'))
 @section('activeNav', 'recipes')
diff --git a/views/recipessettings.blade.php b/views/recipessettings.blade.php
index 9d0e83ff..3fe571f0 100644
--- a/views/recipessettings.blade.php
+++ b/views/recipessettings.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Recipes settings'))
 
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index 71c9b2d1..7cb075ce 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Shopping list'))
 @section('activeNav', 'shoppinglist')
diff --git a/views/shoppinglistform.blade.php b/views/shoppinglistform.blade.php
index 3572997b..5f556600 100644
--- a/views/shoppinglistform.blade.php
+++ b/views/shoppinglistform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit shopping list'))
diff --git a/views/shoppinglistitemform.blade.php b/views/shoppinglistitemform.blade.php
index d220825a..27b4bf48 100644
--- a/views/shoppinglistitemform.blade.php
+++ b/views/shoppinglistitemform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit shopping list item'))
diff --git a/views/shoppinglistsettings.blade.php b/views/shoppinglistsettings.blade.php
index 7eb5b2c9..20ab46f0 100644
--- a/views/shoppinglistsettings.blade.php
+++ b/views/shoppinglistsettings.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Shopping list settings'))
 
diff --git a/views/shoppinglocationform.blade.php b/views/shoppinglocationform.blade.php
index c05c5b05..61f755f5 100644
--- a/views/shoppinglocationform.blade.php
+++ b/views/shoppinglocationform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit store'))
diff --git a/views/shoppinglocations.blade.php b/views/shoppinglocations.blade.php
index 6306f565..9a5d6765 100644
--- a/views/shoppinglocations.blade.php
+++ b/views/shoppinglocations.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Stores'))
 @section('activeNav', 'shoppinglocations')
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 01a6ea59..dbafa8f7 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Stock entries'))
 @section('viewJsName', 'stockentries')
diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php
index 688101da..c967e2cc 100644
--- a/views/stockentryform.blade.php
+++ b/views/stockentryform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Edit stock entry'))
 @section('viewJsName', 'stockentryform')
diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php
index 284d09d6..d7314b43 100644
--- a/views/stockjournal.blade.php
+++ b/views/stockjournal.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Stock journal'))
 @section('activeNav', 'stockjournal')
diff --git a/views/stockjournalsummary.blade.php b/views/stockjournalsummary.blade.php
index f1b0726b..8ffff7f2 100644
--- a/views/stockjournalsummary.blade.php
+++ b/views/stockjournalsummary.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Stock journal summary'))
 @section('activeNav', '')
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index 09688891..8f8e1298 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Stock overview'))
 @section('activeNav', 'stockoverview')
diff --git a/views/stocksettings.blade.php b/views/stocksettings.blade.php
index 697e798f..917882f1 100644
--- a/views/stocksettings.blade.php
+++ b/views/stocksettings.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Stock settings'))
 
diff --git a/views/taskcategories.blade.php b/views/taskcategories.blade.php
index 96dcab79..126ac1df 100644
--- a/views/taskcategories.blade.php
+++ b/views/taskcategories.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Task categories'))
 @section('activeNav', 'taskcategories')
diff --git a/views/taskcategoryform.blade.php b/views/taskcategoryform.blade.php
index bcde2684..407d2d8f 100644
--- a/views/taskcategoryform.blade.php
+++ b/views/taskcategoryform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit task category'))
diff --git a/views/taskform.blade.php b/views/taskform.blade.php
index e4476950..7a71b215 100644
--- a/views/taskform.blade.php
+++ b/views/taskform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit task'))
diff --git a/views/tasks.blade.php b/views/tasks.blade.php
index 19f0833f..5a1505a6 100644
--- a/views/tasks.blade.php
+++ b/views/tasks.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Tasks'))
 @section('activeNav', 'tasks')
diff --git a/views/taskssettings.blade.php b/views/taskssettings.blade.php
index 1d15ac15..490e36b5 100644
--- a/views/taskssettings.blade.php
+++ b/views/taskssettings.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Tasks settings'))
 
diff --git a/views/transfer.blade.php b/views/transfer.blade.php
index 5fb9a9e5..feedd5cf 100644
--- a/views/transfer.blade.php
+++ b/views/transfer.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Transfer'))
 @section('activeNav', 'transfer')
diff --git a/views/userentities.blade.php b/views/userentities.blade.php
index 7eddb65b..5c05e44d 100644
--- a/views/userentities.blade.php
+++ b/views/userentities.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Userentities'))
 @section('activeNav', 'userentities')
diff --git a/views/userentityform.blade.php b/views/userentityform.blade.php
index 9c59d49d..71c953e7 100644
--- a/views/userentityform.blade.php
+++ b/views/userentityform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit userentity'))
diff --git a/views/userfieldform.blade.php b/views/userfieldform.blade.php
index 270b0900..51ba9c92 100644
--- a/views/userfieldform.blade.php
+++ b/views/userfieldform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit userfield'))
diff --git a/views/userfields.blade.php b/views/userfields.blade.php
index 98b706f8..3a426e8a 100644
--- a/views/userfields.blade.php
+++ b/views/userfields.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Userfields'))
 @section('activeNav', 'userfields')
diff --git a/views/userform.blade.php b/views/userform.blade.php
index fd66f95d..9337a991 100644
--- a/views/userform.blade.php
+++ b/views/userform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit user'))
diff --git a/views/userobjectform.blade.php b/views/userobjectform.blade.php
index c5432dbe..7b331197 100644
--- a/views/userobjectform.blade.php
+++ b/views/userobjectform.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @if($mode == 'edit')
 @section('title', $__t('Edit %s', $userentity->caption))
diff --git a/views/userobjects.blade.php b/views/userobjects.blade.php
index bfa2c0b7..5bd16345 100644
--- a/views/userobjects.blade.php
+++ b/views/userobjects.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $userentity->caption)
 @section('activeNav', 'userentity-' . $userentity->name)
diff --git a/views/userpermissions.blade.php b/views/userpermissions.blade.php
index 843b38dd..caf41812 100644
--- a/views/userpermissions.blade.php
+++ b/views/userpermissions.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Permissions for user %s', GetUserDisplayName($user)))
 @section('activeNav', '')
diff --git a/views/users.blade.php b/views/users.blade.php
index ca573c75..3a3a8914 100644
--- a/views/users.blade.php
+++ b/views/users.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('Users'))
 @section('activeNav', '')
diff --git a/views/usersettings.blade.php b/views/usersettings.blade.php
index 6f4bd66e..bc4c8e22 100644
--- a/views/usersettings.blade.php
+++ b/views/usersettings.blade.php
@@ -1,4 +1,4 @@
-@extends('layout.default')
+@extends($rootLayout)
 
 @section('title', $__t('User settings'))
 @section('activeNav', '')