diff --git a/js/grocy.js b/js/grocy.js
index 216220bc..d4c0f345 100644
--- a/js/grocy.js
+++ b/js/grocy.js
@@ -61,14 +61,40 @@ class GrocyClass
 		Object.assign(strings.messages[""], config.GettextPo.messages[""]);
 		this.Translator = new Translator(strings);
 
-
-
 		this.FrontendHelpers = new GrocyFrontendHelpers(this, this.Api);
 		this.WakeLock = new WakeLock(this);
 		this.UISound = new UISound(this);
 		this.Nightmode = new Nightmode(this);
-		this.Nightmode.StartWatchdog();
+
 		this.HeaderClock = new HeaderClock(this);
+		var self = this;
+
+		// defer some stuff until DOM content has loaded
+		document.addEventListener("DOMContentLoaded", function() 
+		{
+			self.Nightmode.Initialize();
+			self.Nightmode.StartWatchdog();
+
+			// DB Changed Handling
+			if (self.UserId !== -1)
+			{
+
+				self.Api.Get('system/db-changed-time',
+					function(result)
+					{
+						self.DatabaseChangedTime = moment(result.changed_time);
+						setInterval(self.CheckDatabase(), 60000);
+						// Increase the idle time once every second
+						// On any interaction it will be reset to 0 (see above)
+						setInterval(self.IncrementIdleTime(), 1000);
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		});
 
 		// save the config
 		this.config = config;
@@ -81,22 +107,6 @@ class GrocyClass
 				}
 			});
 		}
-
-		// DB Changed Handling
-		if (this.UserId !== -1)
-		{
-			var self = this;
-			this.Api.Get('system/db-changed-time',
-				function(result)
-				{
-					self.DatabaseChangedTime = moment(result.changed_time);
-				},
-				function(xhr)
-				{
-					console.error(xhr);
-				}
-			);
-		}
 	}
 
 	static createSingleton(config)
@@ -106,11 +116,6 @@ class GrocyClass
 			var grocy = new GrocyClass(config);
 			window.Grocy = grocy;
 			// Check if the database has changed once a minute
-
-			setInterval(grocy.CheckDatabase(), 60000);
-			// Increase the idle time once every second
-			// On any interaction it will be reset to 0 (see above)
-			setInterval(grocy.IncrementIdleTime(), 1000);
 			window.onmousemove = grocy.ResetIdleTime;
 			window.onmousedown = grocy.ResetIdleTime;
 			window.onclick = grocy.ResetIdleTime;
diff --git a/js/helpers/numberdisplay.js b/js/helpers/numberdisplay.js
index 2867f64f..c0fdf31f 100644
--- a/js/helpers/numberdisplay.js
+++ b/js/helpers/numberdisplay.js
@@ -4,38 +4,41 @@ function RefreshLocaleNumberDisplay(rootSelector = "#page-content")
 {
 	$(rootSelector + " .locale-number.locale-number-currency").each(function()
 	{
-		var text = $(this).text();
+		var elem = $(this);
+		var text = elem.text();
 		if (isNaN(text) || text.isEmpty())
 		{
 			return;
 		}
 
 		var value = parseFloat(text);
-		$(this).text(value.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
+		elem.text(value.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }));
 	});
 
 	$(rootSelector + " .locale-number.locale-number-quantity-amount").each(function()
 	{
-		var text = $(this).text();
+		var elem = $(this);
+		var text = elem.text();
 		if (isNaN(text) || text.isEmpty())
 		{
 			return;
 		}
 
 		var value = parseFloat(text);
-		$(this).text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
+		elem.text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_amounts }));
 	});
 
 	$(rootSelector + " .locale-number.locale-number-generic").each(function()
 	{
-		var text = $(this).text();
+		var elem = $(this);
+		var text = elem.text();
 		if (isNaN(text) || text.isEmpty())
 		{
 			return;
 		}
 
 		var value = parseFloat(text);
-		$(this).text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 }));
+		elem.text(value.toLocaleString(undefined, { minimumFractionDigits: 0, maximumFractionDigits: 2 }));
 	});
 }
 
diff --git a/js/lib/nightmode.js b/js/lib/nightmode.js
index 15866987..8bde8763 100644
--- a/js/lib/nightmode.js
+++ b/js/lib/nightmode.js
@@ -4,9 +4,12 @@ class Nightmode
 {
 	constructor(Grocy)
 	{
-		var self = this;
 		this.Grocy = Grocy;
+	}
 
+	Initialize()
+	{
+		var self = this;
 		$("#night-mode-enabled").on("change", function()
 		{
 			var value = $(this).is(":checked");