diff --git a/CHANGELOG.md b/CHANGELOG.md
index f67a8b0d..43fd1112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Nanoleaf: Wizard to generate user authorization token allowing users to configure the device via a single window
-- Nanoleaf: Generation of a default layout per device's configuration, including oriantation
+- Nanoleaf: Generation of a default layout per device's configuration, including orientation
 
 ### Changed
 
diff --git a/assets/webconfig/js/content_leds.js b/assets/webconfig/js/content_leds.js
index 34716f1f..43e286d8 100755
--- a/assets/webconfig/js/content_leds.js
+++ b/assets/webconfig/js/content_leds.js
@@ -2555,7 +2555,7 @@ function nanoleafGeneratelayout(panelLayout, panelOrderTopDown, panelOrderLeftRi
       maxY = panel.maxY;
     }
     if (panel.y < minY) {
-      minY = panel.y
+      minY = panel.y;
     }
   });
 
diff --git a/libsrc/hyperion/SettingsManager.cpp b/libsrc/hyperion/SettingsManager.cpp
index 20ad228c..3fe7e367 100644
--- a/libsrc/hyperion/SettingsManager.cpp
+++ b/libsrc/hyperion/SettingsManager.cpp
@@ -792,7 +792,7 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 					{
 						QString type = newDeviceConfig["type"].toString();
 
-            if (type == "philipshue")
+						if (type == "philipshue")
 						{
 							if (newDeviceConfig.contains("groupId"))
 							{
@@ -822,7 +822,7 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 							}
 						}
 
-            if (type == "nanoleaf")
+						if (type == "nanoleaf")
 						{
 							if (newDeviceConfig.contains("panelStartPos"))
 							{
@@ -832,24 +832,25 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 
 							if (newDeviceConfig.contains("panelOrderTopDown"))
 							{
-								QString panelOrderTopDown;
+								int panelOrderTopDown;
 								if (newDeviceConfig["panelOrderTopDown"].isDouble())
 								{
-									panelOrderTopDown = QString(newDeviceConfig["panelOrderTopDown"].toInt());
+									panelOrderTopDown = newDeviceConfig["panelOrderTopDown"].toInt();
 								}
 								else
 								{
-									panelOrderTopDown = newDeviceConfig["panelOrderTopDown"].toString();
+									panelOrderTopDown = newDeviceConfig["panelOrderTopDown"].toString().toInt();
 								}
 
-								if (newDeviceConfig["panelOrderTopDown"] == "0")
+								newDeviceConfig.remove("panelOrderTopDown");
+								if (panelOrderTopDown == 0)
 								{
 									newDeviceConfig["panelOrderTopDown"] = "top2down";
 									migrated = true;
 								}
 								else
 								{
-									if (newDeviceConfig["panelOrderTopDown"] == "1")
+									if (panelOrderTopDown == 1)
 									{
 										newDeviceConfig["panelOrderTopDown"] = "bottom2up";
 										migrated = true;
@@ -859,26 +860,27 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 
 							if (newDeviceConfig.contains("panelOrderLeftRight"))
 							{
-								QString panelOrderLeftRight;
+								int panelOrderLeftRight;
 								if (newDeviceConfig["panelOrderLeftRight"].isDouble())
 								{
-									panelOrderLeftRight = QString(newDeviceConfig["panelOrderLeftRight"].toInt());
+									panelOrderLeftRight = newDeviceConfig["panelOrderLeftRight"].toInt();
 								}
 								else
 								{
-									panelOrderLeftRight = newDeviceConfig["panelOrderLeftRight"].toString();
+									panelOrderLeftRight = newDeviceConfig["panelOrderLeftRight"].toString().toInt();
 								}
 
-								if (newDeviceConfig["panelOrderLeftRight"] == "0")
+								newDeviceConfig.remove("panelOrderLeftRight");
+								if (panelOrderLeftRight == 0)
 								{
 									newDeviceConfig["panelOrderLeftRight"] = "left2right";
 									migrated = true;
 								}
 								else
 								{
-									if (newDeviceConfig["panelOrderLeftRight"] == "1")
+									if (panelOrderLeftRight == 1)
 									{
-										newDeviceConfig["panelOrderTopDown"] = "right2left";
+										newDeviceConfig["panelOrderLeftRight"] = "right2left";
 										migrated = true;
 									}
 								}