diff --git a/webapp/src/views/BatteryAdminView.vue b/webapp/src/views/BatteryAdminView.vue
index b55b88e51..9260ab8c4 100644
--- a/webapp/src/views/BatteryAdminView.vue
+++ b/webapp/src/views/BatteryAdminView.vue
@@ -128,6 +128,7 @@
                 <InputElement
                     :label="$t('batteryadmin.LimitDischargeCurrent')"
                     v-model="batteryConfigList.enable_discharge_current_limit"
+                    :wide="true"
                     type="checkbox"
                 />
 
@@ -135,6 +136,7 @@
                     <InputElement
                         :label="$t('batteryadmin.DischargeCurrentLimit')"
                         v-model="batteryConfigList.discharge_current_limit"
+                        :wide="true"
                         type="number"
                         min="0"
                         step="0.1"
@@ -143,7 +145,9 @@
 
                     <InputElement
                         :label="$t('batteryadmin.DischargeCurrentLimitBelowSoc')"
+                        v-show="batteryConfigList.enabled"
                         v-model="batteryConfigList.discharge_current_limit_below_soc"
+                        :wide="true"
                         type="number"
                         min="0"
                         max="100"
@@ -154,7 +158,9 @@
 
                     <InputElement
                         :label="$t('batteryadmin.DischargeCurrentLimitBelowVoltage')"
+                        v-show="batteryConfigList.enabled"
                         v-model="batteryConfigList.discharge_current_limit_below_voltage"
+                        :wide="true"
                         type="number"
                         min="0"
                         max="60"
@@ -165,6 +171,8 @@
 
                     <InputElement
                         :label="$t('batteryadmin.UseBatteryReportedDischargeCurrentLimit')"
+                        :wide="true"
+                        v-show="batteryConfigList.enabled"
                         v-model="batteryConfigList.use_battery_reported_discharge_current_limit"
                         type="checkbox"
                     />
@@ -179,13 +187,15 @@
                     <div
                         class="alert alert-secondary"
                         role="alert"
+                        v-show="batteryConfigList.enabled"
                         v-html="$t('batteryadmin.BatteryReportedDischargeCurrentLimitInfo')"
                     ></div>
 
-                    <template v-if="batteryConfigList.provider == 2">
+                    <template v-if="batteryConfigList.enabled && batteryConfigList.provider == 2">
                         <InputElement
                             :label="$t('batteryadmin.MqttDischargeCurrentTopic')"
                             v-model="batteryConfigList.mqtt_discharge_current_topic"
+                            :wide="true"
                             type="text"
                             maxlength="256"
                         />
@@ -193,17 +203,18 @@
                         <InputElement
                             :label="$t('batteryadmin.MqttJsonPath')"
                             v-model="batteryConfigList.mqtt_discharge_current_json_path"
+                            :wide="true"
                             type="text"
                             maxlength="128"
                             :tooltip="$t('batteryadmin.MqttJsonPathDescription')"
                         />
 
                         <div class="row mb-3">
-                            <label for="mqtt_amperage_unit" class="col-sm-2 col-form-label">
+                            <label for="mqtt_amperage_unit" class="col-sm-4 col-form-label">
                                 {{ $t('batteryadmin.MqttAmperageUnit') }}
                             </label>
 
-                            <div class="col-sm-10">
+                            <div class="col-sm-8">
                                 <select
                                     id="mqtt_amperage_unit"
                                     class="form-select"