diff --git a/exp_scenario/module/control/vlayer.lua b/exp_scenario/module/control/vlayer.lua
index 3b7be16d..39c4bee3 100644
--- a/exp_scenario/module/control/vlayer.lua
+++ b/exp_scenario/module/control/vlayer.lua
@@ -480,9 +480,9 @@ function Vlayer.get_statistics(s_index)
         energy_max = production,
         energy_production = production * production_multiplier,
         energy_total_production = properties.total_production * sustained_multiplier * mega,
+        energy_sustained = production * sustained_multiplier,
         energy_input_limit = properties.input_limit * mega,
         energy_output_limit = properties.output_limit * mega,
-        energy_sustained = production * sustained_multiplier,
         energy_capacity = properties.capacity * mega,
         energy_storage = vd.storage.energy,
     }
diff --git a/exp_scenario/module/gui/vlayer.lua b/exp_scenario/module/gui/vlayer.lua
index dad093d6..9c5c900b 100644
--- a/exp_scenario/module/gui/vlayer.lua
+++ b/exp_scenario/module/gui/vlayer.lua
@@ -36,7 +36,7 @@ end
 --- Statistics shown as progress bars, in display order
 --- @type { name: string, caption: LocalisedString, tooltip: LocalisedString }[]
 local stats = {}
-for _, name in ipairs{ "sustained", "production", "capacity", "limit", "surface-area" } do
+for _, name in ipairs{ "production", "capacity", "sustained", "limit", "surface-area" } do
     stats[#stats + 1] = {
         name = name,
         caption = { "exp-gui_vlayer.caption-stat-" .. name },
@@ -150,17 +150,14 @@ function Elements.stats_table.calculate_display_data(s_index)
     local statistics = Vlayer.get_statistics(s_index)
     local items = Vlayer.get_items(s_index)
     local allocated = Vlayer.get_allocated_items(s_index)
+    local en_prod = ceil(statistics.energy_production)
     local sustained = ceil(statistics.energy_sustained) / max(statistics.energy_total_production, 1)
-    local production = ceil(statistics.energy_production) / max(ceil(statistics.energy_max), 1)
+    local production = en_prod / max(ceil(statistics.energy_max), 1)
     local capacity = statistics.energy_storage / max(statistics.energy_capacity, 1)
-    local limit = statistics.energy_input_limit / max(statistics.energy_output_limit, 1)
+    local limit_n = min(statistics.energy_input_limit, en_prod)
+    local limit = limit_n / max(en_prod, 1)
     local surface_area = statistics.remaining_surface_area / max(statistics.total_surface_area, 1)
     return {
-        sustained = {
-            value = sustained,
-            caption = format_energy(statistics.energy_sustained, "W") .. " / " .. format_energy(statistics.energy_total_production, "W"),
-            tooltip = format_string("%.1f %%", sustained * 100),
-        },
         production = {
             value = production,
             caption = format_energy(statistics.energy_production, "W") .. " / " .. format_energy(statistics.energy_max, "W"),
@@ -171,9 +168,14 @@ function Elements.stats_table.calculate_display_data(s_index)
             caption = format_energy(statistics.energy_storage, "J") .. " / " .. format_energy(statistics.energy_capacity, "J"),
             tooltip = format_string("%.1f %%", capacity * 100),
         },
+        sustained = {
+            value = sustained,
+            caption = format_energy(statistics.energy_sustained, "W") .. " / " .. format_energy(statistics.energy_total_production, "W"),
+            tooltip = format_string("%.1f %%", sustained * 100),
+        },
         limit = {
-            value = min(limit, 1),
-            caption = format_energy(statistics.energy_input_limit, "W") .. " , " .. format_energy(statistics.energy_output_limit, "W"),
+            value = limit,
+            caption = format_energy(limit_n, "W") .. " / " .. format_energy(statistics.energy_production, "W"),
             tooltip = format_string("%.1f %%", limit * 100),
         },
         ["surface-area"] = {
diff --git a/exp_scenario/module/locale/en.cfg b/exp_scenario/module/locale/en.cfg
index 1d4adc2d..640ba70e 100644
--- a/exp_scenario/module/locale/en.cfg
+++ b/exp_scenario/module/locale/en.cfg
@@ -470,14 +470,14 @@ caption-view-footer=Task details
 [exp-gui_vlayer]
 tooltip-main=Virtual Layer
 selection-name=vlayer
-caption-stat-sustained=[virtual-signal=signal-S] Sustained Production
-tooltip-stat-sustained=Power production averaged over a day, out of what every stored solar panel could give
 caption-stat-production=[virtual-signal=signal-P] Current Production
 tooltip-stat-production=Power production right now, out of the production in full daylight
 caption-stat-capacity=[virtual-signal=signal-E] Battery Charge
 tooltip-stat-capacity=Stored energy out of the accumulator capacity
-caption-stat-limit=[virtual-signal=signal-I] Flow limit
-tooltip-stat-limit=Input and Output limit of the storage system
+caption-stat-sustained=[virtual-signal=signal-S] Sustained Production
+tooltip-stat-sustained=Power production averaged over a day, out of what every stored solar panel could give
+caption-stat-limit=[virtual-signal=signal-I] Input limit
+tooltip-stat-limit=Energy limit the system can absorb
 caption-stat-surface-area=[virtual-signal=signal-R] Remaining Surface
 tooltip-stat-surface-area=Remaining surface area, insert landfill to increase it
 type-energy=Energy
diff --git a/exp_scenario/module/locale/zh-CN.cfg b/exp_scenario/module/locale/zh-CN.cfg
index 920f1f36..4bd7b727 100644
--- a/exp_scenario/module/locale/zh-CN.cfg
+++ b/exp_scenario/module/locale/zh-CN.cfg
@@ -489,14 +489,14 @@ tooltip-goto-disabled=你不在傳送陣， 請移至任意傳送陣
 [exp-gui_vlayer]
 tooltip-main=Vlayer 介面
 selection-name=vlayer
-caption-stat-sustained=[virtual-signal=signal-S] 持續產能
-tooltip-stat-sustained=持續電力產能
 caption-stat-production=[virtual-signal=signal-P] 現時產能
 tooltip-stat-production=現時電力產能
 caption-stat-capacity=[virtual-signal=signal-E] 電池電量
 tooltip-stat-capacity=現時電池電量 / 電池最大容量
-caption-stat-limit=[virtual-signal=signal-I] 流量限制
-tooltip-stat-limit=儲存系統的輸入和輸出限制
+caption-stat-sustained=[virtual-signal=signal-S] 持續產能
+tooltip-stat-sustained=持續電力產能
+caption-stat-limit=[virtual-signal=signal-I] 輸入限制
+tooltip-stat-limit=系統可吸收的能量限制
 caption-stat-surface-area=[virtual-signal=signal-R] 餘下土地
 tooltip-stat-surface-area=餘下土地。 放入堆填來增加
 type-energy=電力
diff --git a/exp_scenario/module/locale/zh-TW.cfg b/exp_scenario/module/locale/zh-TW.cfg
index 920f1f36..4bd7b727 100644
--- a/exp_scenario/module/locale/zh-TW.cfg
+++ b/exp_scenario/module/locale/zh-TW.cfg
@@ -489,14 +489,14 @@ tooltip-goto-disabled=你不在傳送陣， 請移至任意傳送陣
 [exp-gui_vlayer]
 tooltip-main=Vlayer 介面
 selection-name=vlayer
-caption-stat-sustained=[virtual-signal=signal-S] 持續產能
-tooltip-stat-sustained=持續電力產能
 caption-stat-production=[virtual-signal=signal-P] 現時產能
 tooltip-stat-production=現時電力產能
 caption-stat-capacity=[virtual-signal=signal-E] 電池電量
 tooltip-stat-capacity=現時電池電量 / 電池最大容量
-caption-stat-limit=[virtual-signal=signal-I] 流量限制
-tooltip-stat-limit=儲存系統的輸入和輸出限制
+caption-stat-sustained=[virtual-signal=signal-S] 持續產能
+tooltip-stat-sustained=持續電力產能
+caption-stat-limit=[virtual-signal=signal-I] 輸入限制
+tooltip-stat-limit=系統可吸收的能量限制
 caption-stat-surface-area=[virtual-signal=signal-R] 餘下土地
 tooltip-stat-surface-area=餘下土地。 放入堆填來增加
 type-energy=電力