diff --git a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
index b1af85c8..2ed68e76 100644
--- a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
+++ b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
@@ -38,7 +38,7 @@ abstract final class EnergyManagementChartsHelper {
         sideTitles: SideTitles(
           showTitles: true,
           maxIncluded: false,
-          minIncluded: false,
+          minIncluded: true,
           interval: leftTitlesInterval,
           reservedSize: 110,
           getTitlesWidget: (value, meta) => Padding(
diff --git a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart_box.dart b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart_box.dart
index f22517d5..be5faf57 100644
--- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart_box.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart_box.dart
@@ -23,7 +23,6 @@ class EnergyConsumptionPerDeviceChartBox extends StatelessWidget {
           ),
           padding: const EdgeInsets.all(30),
           child: Column(
-            spacing: 20,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               AnalyticsErrorWidget(state.errorMessage),
@@ -52,7 +51,9 @@ class EnergyConsumptionPerDeviceChartBox extends StatelessWidget {
                   ),
                 ],
               ),
+              const SizedBox(height: 20),
               const Divider(height: 0),
+              const SizedBox(height: 20),
               Expanded(
                 child: EnergyConsumptionPerDeviceChart(chartData: state.chartData),
               ),
diff --git a/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart b/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart
index 9e70e45e..e197c297 100644
--- a/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart
@@ -19,7 +19,6 @@ class TotalEnergyConsumptionChartBox extends StatelessWidget {
         ),
         padding: const EdgeInsets.all(30),
         child: Column(
-          spacing: 20,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             AnalyticsErrorWidget(state.errorMessage),
@@ -39,7 +38,9 @@ class TotalEnergyConsumptionChartBox extends StatelessWidget {
                 const Spacer(flex: 4),
               ],
             ),
+            const SizedBox(height: 20),
             const Divider(),
+            const SizedBox(height: 20),
             TotalEnergyConsumptionChart(chartData: state.chartData),
           ],
         ),
diff --git a/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart_box.dart b/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart_box.dart
index ab1d1699..08f7223f 100644
--- a/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart_box.dart
+++ b/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart_box.dart
@@ -22,7 +22,6 @@ class OccupancyChartBox extends StatelessWidget {
           padding: const EdgeInsets.all(30),
           decoration: containerWhiteDecoration,
           child: Column(
-            spacing: 20,
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
@@ -65,7 +64,9 @@ class OccupancyChartBox extends StatelessWidget {
                   ),
                 ],
               ),
-              const Divider(height: 0),
+              const SizedBox(height: 20),
+              const Divider(),
+              const SizedBox(height: 20),
               Expanded(child: OccupancyChart(chartData: state.chartData)),
             ],
           ),
diff --git a/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_box.dart b/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_box.dart
index cab9eab4..c3b537e0 100644
--- a/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_box.dart
+++ b/lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_box.dart
@@ -22,7 +22,6 @@ class OccupancyHeatMapBox extends StatelessWidget {
           padding: const EdgeInsets.all(30),
           decoration: containerWhiteDecoration,
           child: Column(
-            spacing: 20,
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
@@ -66,7 +65,9 @@ class OccupancyHeatMapBox extends StatelessWidget {
                   ),
                 ],
               ),
-              const Divider(height: 0),
+              const SizedBox(height: 20),
+              const Divider(),
+              const SizedBox(height: 20),
               Expanded(
                 child: OccupancyHeatMap(
                   heatMapData: state.heatMapData.asMap().map(
diff --git a/lib/pages/analytics/widgets/analytics_error_widget.dart b/lib/pages/analytics/widgets/analytics_error_widget.dart
index 60167992..7c560da4 100644
--- a/lib/pages/analytics/widgets/analytics_error_widget.dart
+++ b/lib/pages/analytics/widgets/analytics_error_widget.dart
@@ -11,14 +11,17 @@ class AnalyticsErrorWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return Visibility(
       visible: errorMessage != null || (errorMessage?.isNotEmpty ?? false),
-      child: Text(
-        errorMessage ?? 'Something went wrong',
-        maxLines: 1,
-        overflow: TextOverflow.ellipsis,
-        style: context.textTheme.bodySmall?.copyWith(
-          color: ColorsManager.red,
-          fontWeight: FontWeight.w400,
-          fontSize: 8,
+      child: Padding(
+        padding: const EdgeInsetsDirectional.only(bottom: 10),
+        child: Text(
+          errorMessage ?? 'Something went wrong',
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: context.textTheme.bodySmall?.copyWith(
+            color: ColorsManager.red,
+            fontWeight: FontWeight.w400,
+            fontSize: 8,
+          ),
         ),
       ),
     );