diff --git a/lib/Components/video_viewer_youtube.dart b/lib/Components/video_viewer_youtube.dart
index ed6928c..2a5e305 100644
--- a/lib/Components/video_viewer_youtube.dart
+++ b/lib/Components/video_viewer_youtube.dart
@@ -32,7 +32,7 @@ class _VideoViewerYoutube extends State<VideoViewerYoutube> {
           params: iframe.YoutubePlayerParams(
               mute: false,
               showControls: false,
-              showFullscreenButton: true,
+              showFullscreenButton: false,
               loop: false,
               showVideoAnnotations: false,
               strictRelatedVideos: false,
diff --git a/lib/Screens/Agenda/event_list_item.dart b/lib/Screens/Agenda/event_list_item.dart
index bb0b880..81eb5c2 100644
--- a/lib/Screens/Agenda/event_list_item.dart
+++ b/lib/Screens/Agenda/event_list_item.dart
@@ -55,7 +55,8 @@ class EventListItem extends StatelessWidget {
                 eventAgenda.image != null ? ClipRRect(
                   borderRadius: const BorderRadius.only(topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
                   child: Container(
-                    constraints: const BoxConstraints(maxHeight: 175, maxWidth: 250),
+                    //color: Colors.green,
+                    //constraints: const BoxConstraints(maxHeight: 175),
                     child: CachedNetworkImage(
                       imageUrl: eventAgenda.image!,
                       width: size.width,
diff --git a/lib/Screens/Agenda/month_filter.dart b/lib/Screens/Agenda/month_filter.dart
index ba57cfe..9523a91 100644
--- a/lib/Screens/Agenda/month_filter.dart
+++ b/lib/Screens/Agenda/month_filter.dart
@@ -52,7 +52,7 @@ class _MonthFilterState extends State<MonthFilter> {
               title: Text(
                 '$monthName $annee (${nbrEvents})',
                 style: TextStyle(
-                  fontSize: 14.0,
+                  fontSize: 15.0,
                   fontWeight: _selectedMonth == monthYear ? FontWeight.bold : FontWeight.normal,
                   color: _selectedMonth == monthYear ? kTestSecondColor : null,
                 ),
@@ -88,7 +88,7 @@ class _MonthFilterState extends State<MonthFilter> {
       title: Text(
         '${TranslationHelper.getFromLocale("agenda.all", appContext.getContext())} ($totalEvents)',
         style: TextStyle(
-          fontSize: 14.0,
+          fontSize: 15.0,
           fontWeight: _selectedMonth == null ? FontWeight.bold : FontWeight.normal,
           color: _selectedMonth == null ? kTestSecondColor : null,
         ),
diff --git a/lib/Screens/MainView/weather_view.dart b/lib/Screens/MainView/weather_view.dart
index 0a62aae..070242b 100644
--- a/lib/Screens/MainView/weather_view.dart
+++ b/lib/Screens/MainView/weather_view.dart
@@ -6,6 +6,7 @@ import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 import 'package:tablet_app/Helpers/translationHelper.dart';
 import 'package:tablet_app/Models/WeatherData.dart';
+import 'package:tablet_app/Models/tabletContext.dart';
 import 'package:tablet_app/app_context.dart';
 import 'package:tablet_app/constants.dart';
 import 'package:intl/intl.dart';
@@ -120,19 +121,19 @@ class WeatherView extends StatelessWidget {
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
     final appContext = Provider.of<AppContext>(context);
+    TabletAppContext tabletAppContext = appContext.getContext();
 
     return InkWell(
       onTap: () {
 
-        print(weatherData.list!.first.weather!.first.main);
+        /*print(weatherData.list!.first.weather!.first.main);
         print(weatherData.list!.first.weather!.first.description);
         print(weatherData.list!.first.weather!.first.icon!);
         print(weatherData.list!.first.dtTxt);
-        print(weatherData.list!.first.dt);
+        print(weatherData.list!.first.dt);*/
 
-        String formattedDate = formatTimestamp(weatherData.list!.first.dt!, appContext, false, false);
-
-        getNextFiveDaysForecast(weatherData.list!);
+        //String formattedDate = formatTimestamp(weatherData.list!.first.dt!, appContext, false, false);
+        //getNextFiveDaysForecast(weatherData.list!);
 
         showDialog(
           context: context,
@@ -194,7 +195,7 @@ class WeatherView extends StatelessWidget {
                         children: [
                           Padding(
                             padding: const EdgeInsets.all(10.0),
-                            child: Center(child: Text(weatherData.city!.name!, style: TextStyle(fontSize: kSectionTitleDetailSize, fontWeight: FontWeight.w500, color: Colors.black54))),
+                            child: Center(child: Text(tabletAppContext.configuration!.weatherCity!, style: TextStyle(fontSize: kSectionTitleDetailSize, fontWeight: FontWeight.w500, color: Colors.black54))),
                           ),
                           Row(
                             mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/Screens/Map/google_map_view.dart b/lib/Screens/Map/google_map_view.dart
index 714a04e..0ec9c55 100644
--- a/lib/Screens/Map/google_map_view.dart
+++ b/lib/Screens/Map/google_map_view.dart
@@ -106,7 +106,7 @@ class _GoogleMapViewState extends State<GoogleMapView> {
     //print(mapTypeApp.toString());
 
     MapType type = MapType.hybrid;
-    if(kIsWeb) {
+    //if(kIsWeb) {
       if(widget.mapDTO!.mapType != null) {
         switch(widget.mapDTO!.mapType!.value) {
           case 0:
@@ -126,9 +126,12 @@ class _GoogleMapViewState extends State<GoogleMapView> {
             break;
         }
       }
-    } else {
+
+    /*} else {
+      print("is OTHEER");
       type = EnumToString.fromString(MapType.values, widget.mapDTO!.mapType.toString()) != null ? EnumToString.fromString(MapType.values, widget.mapDTO!.mapType.toString())! : MapType.hybrid;
-    }
+    }*/
+
 
     //MapType type = EnumToString.fromString(MapType.values, widget.mapDTO!.mapType.toString()) != null ? EnumToString.fromString(MapType.values, widget.mapDTO!.mapType.toString())! : MapType.hybrid;
     return Stack(
@@ -137,6 +140,7 @@ class _GoogleMapViewState extends State<GoogleMapView> {
           child: GoogleMap(
             mapType: type, // widget.mapDTO!.mapType != null ? EnumToString.fromString(MapType.values, widget.mapDTO!.mapType.toString())!: MapType.hybrid,
             mapToolbarEnabled: false,
+            indoorViewEnabled: false,
             initialCameraPosition: CameraPosition(
               target: LatLng(50.465503, 4.865105), //TODO add element in manager // MDLF 50.416639, 4.879169 / Namur 50.465503, 4.865105
               zoom: widget.mapDTO!.zoom != null ? widget.mapDTO!.zoom!.toDouble() : 18,