diff --git a/app/lib/widgets/osm_layer.dart b/app/lib/widgets/osm_layer.dart
index 33b000b67de82a7a5930ad96c5a3c112f460ca3d..2a0c38d9e7b6f89093afdda44ddf13973a87c221 100644
--- a/app/lib/widgets/osm_layer.dart
+++ b/app/lib/widgets/osm_layer.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
 import 'package:flutter_map/flutter_map.dart';
 
 import '../../consts.dart';
@@ -17,12 +18,12 @@ class OSM extends StatelessWidget {
     // Init list of polygons
     List<Polygon> polygons = [];
 
-    // Map each element from markerList to a measurement object
-
     return FlutterMap(
       options: MapOptions(
-        center: mapCenter,
-        zoom: 9.0,
+        bounds: LatLngBounds(
+          LatLng(61.1947, 10.3491),
+          LatLng(60.3592, 11.3805),
+        ),
       ),
       children: [
         TileLayer(
diff --git a/app/lib/widgets/stat_charts.dart b/app/lib/widgets/stat_charts.dart
index 36a379b4aa384f50756cd865d7883310aa25c9ad..8d480da1f448588aecf67fdec4e210092e6286e2 100644
--- a/app/lib/widgets/stat_charts.dart
+++ b/app/lib/widgets/stat_charts.dart
@@ -6,7 +6,7 @@ class StatCharts extends StatelessWidget {
 
   Widget buildLineChart(BuildContext context) {
     return Padding(
-        padding: const EdgeInsets.only(right: 17),
+        padding: const EdgeInsets.only(right: 20),
         child: LineChart(
           LineChartData(
             backgroundColor: Colors.grey.shade800,
@@ -23,16 +23,16 @@ class StatCharts extends StatelessWidget {
                 getTextStyles: (value) => const TextStyle(color: Colors.white60),
                 getTitles: (double value) {
                   switch (value.toInt()) { // Map int values to months
-                    case 1:
+                    case 0:
                       return 'January';
-                    case 2:
+                    case 1:
                       return 'February';
-                    case 3:
+                    case 2:
                       return 'March';
-                    case 4:
+                    case 3:
                       return 'April';
                     default:
-                      return '';
+                      return '...';
                   }
                 },
               ),
@@ -65,7 +65,7 @@ class StatCharts extends StatelessWidget {
 
   Widget buildBarChart(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.only(right: 17),
+      padding: const EdgeInsets.only(right: 20),
       child: BarChart(
         BarChartData(
           alignment: BarChartAlignment.spaceAround,