diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e050e33b..91499e64 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -133,9 +133,8 @@
     <string name="pref.aa.surface.fps.display_status">Display Head unit refresh rate (FPS)</string>
 
     <string name="pref.aa.renderer_type">Screen type</string>
-    <string name="pref.aa.renderer.gauge.progress_type">Gauge screen progress-bar type</string>
-    <string name="pref.aa.renderer.gauge.top_offset">Label top offset</string>
-    <string name="pref.aa.renderer.gauge.category">Gauge settings</string>
+    <string name="pref.aa.renderer.gauge.progress_type"><b><i>Gauge</i></b> screen progress bar type</string>
+    <string name="pref.aa.renderer.gauge.top_offset"><b><i>Gauge</i></b> screen label top offset</string>
 
     <string name="pref.aa.virtual_screens.number_of_items_in_column.category">Number of columns</string>
     <string name="pref.aa.virtual_screens.number_of_items_in_column.category.summary">Choose number of columns for each individual virtual screen</string>
@@ -148,7 +147,7 @@
     <string name="pref.aa.virtual_screens.number_of_items_in_column.6">Number of columns for screen 6</string>
     <string name="pref.aa.virtual_screens.number_of_items_in_column.7">Number ofs columns for screen 7</string>
 
-    <string name="pref.aa.virtual_screens.category">Virtual screens individual preferences</string>
+    <string name="pref.aa.virtual_screens.category">Giulia and Gauge</string>
 
     <string name="pref.aa.virtual_screens.visibility.category">Visibility</string>
     <string name="pref.aa.virtual_screens.visibility.category.summary">Choose how many virtual screens should be rendered</string>
@@ -170,9 +169,9 @@
     <string name="pref.aa.display_pid_history">Display PIDs min and max value collected</string>
     <string name="pref.aa.display_pid_scale">Display PIDs scale</string>
 
-    <string name="pref.aa.screen.load_last_visited.enabled">Load automatically last visited screen</string>
+    <string name="pref.aa.screen.load_last_visited.enabled">Automatically load the last used screen</string>
     <string name="pref.aa.display_status_panel">Display status panel</string>
-    <string name="pref.aa.connection_auto">Automatic connection to the OBD2 adapter when enter AA mode</string>
+    <string name="pref.aa.connection_auto">Automatically connect when entering AA mode</string>
     <string name="pref.aa.virtual_screens.sort_order.enabled">Enable PIDs sort order</string>
     <string name="pref.aa.virtual_screens.sort_order.enabled_summary">This is an EXPERIMENTAL feature.\nDefine PIDs order on the screen through drag and drop on the PIDs selection list.\nWhen selected App restart is required.</string>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5bbbc24a..c17904c6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -938,14 +938,6 @@
                     android:title="@string/pref.aa.general_category"
                     app:singleLineTitle="false">
 
-                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="false"
-                        android:key="pref.aa.virtual_screens.sort_order.enabled"
-                        android:summary="@string/pref.aa.virtual_screens.sort_order.enabled_summary"
-                        android:title="@string/pref.aa.virtual_screens.sort_order.enabled"
-                        app:experimental="true"
-                        app:singleLineTitle="false" />
-
                     <CheckBoxPreference
                         android:defaultValue="false"
                         android:key="pref.aa.connection.auto.enabled"
@@ -964,18 +956,6 @@
                         android:title="@string/pref.aa.display_status_panel"
                         app:singleLineTitle="false" />
 
-                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="true"
-                        android:key="pref.aa.virtual_screens.scale.enabled"
-                        android:title="@string/pref.aa.display_pid_scale"
-                        app:singleLineTitle="false" />
-
-                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="false"
-                        android:key="pref.aa.pids.history.enabled"
-                        android:title="@string/pref.aa.display_pid_history"
-                        app:singleLineTitle="false" />
-
                     <org.obd.graphs.preferences.aa.AASeekBar
                         android:defaultValue="6"
                         android:dialogTitle="@string/pref.aa.virtual_screens.screen.max_items"
@@ -998,13 +978,35 @@
                         android:title="@string/pref.screen.fps"
                         app:singleLineTitle="false"
                         app:useSimpleSummaryProvider="true" />
+
+                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="pref.aa.virtual_screens.sort_order.enabled"
+                        android:summary="@string/pref.aa.virtual_screens.sort_order.enabled_summary"
+                        android:title="@string/pref.aa.virtual_screens.sort_order.enabled"
+                        app:experimental="true"
+                        app:singleLineTitle="false" />
+
                 </PreferenceCategory>
 
 
                 <PreferenceCategory
-                    android:title="@string/pref.aa.renderer.gauge.category"
+                    android:title="@string/pref.aa.virtual_screens.category"
                     app:singleLineTitle="false">
 
+
+                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
+                        android:defaultValue="true"
+                        android:key="pref.aa.virtual_screens.scale.enabled"
+                        android:title="@string/pref.aa.display_pid_scale"
+                        app:singleLineTitle="false" />
+
+                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="pref.aa.pids.history.enabled"
+                        android:title="@string/pref.aa.display_pid_history"
+                        app:singleLineTitle="false" />
+
                     <org.obd.graphs.preferences.aa.AAListPreference
                         android:defaultValue="LONG"
                         android:dialogTitle="@string/pref.aa.renderer.gauge.progress_type"
@@ -1025,11 +1027,6 @@
                         app:showSeekBarValue="true"
                         app:singleLineTitle="false"
                         app:useSimpleSummaryProvider="true" />
-                </PreferenceCategory>
-
-                <PreferenceCategory
-                    android:title="@string/pref.aa.virtual_screens.category"
-                    app:singleLineTitle="false">
 
                     <PreferenceScreen
                         android:key="pref.aa.displayed.pids"
@@ -1270,68 +1267,6 @@
                     </PreferenceScreen>
                 </PreferenceCategory>
 
-
-                <PreferenceCategory
-                    android:title="@string/pref.aa.alerting_category"
-                    app:singleLineTitle="false">
-
-                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="false"
-                        android:key="pref.aa.alerting.enabled"
-                        android:summary="@string/pref.aa.alerting.enabled_summary"
-                        android:title="@string/pref.aa.alerting.enabled"
-                        app:singleLineTitle="false" />
-
-                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="false"
-                        android:key="pref.aa.alerting.legend.enabled"
-                        android:summary="@string/pref.aa.alerting.legend.enabled_summary"
-                        android:title="@string/pref.aa.alerting.legend.enabled"
-                        app:singleLineTitle="false" />
-                </PreferenceCategory>
-
-                <PreferenceCategory android:title="@string/pref.theme">
-                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="true"
-                        android:key="pref.aa.theme.background.enabled"
-                        android:title="@string/pref.aa.theme.background.enabled"
-                        app:singleLineTitle="false" />
-
-                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
-                        android:defaultValue="false"
-                        android:key="pref.aa.theme.dynamic-selector.enabled"
-                        android:summary="@string/pref.aa.theme.dynamic_selector.enabled_summary"
-                        android:title="@string/pref.aa.theme.dynamic_selector.enabled"
-                        app:singleLineTitle="false" />
-
-                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
-                        android:defaultValue="0xffff0000"
-                        android:key="pref.aa.theme.progressColor"
-                        android:title="@string/pref.aa.theme.progress_bar_color" />
-
-                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
-                        android:defaultValue="0xffffffff"
-                        android:key="pref.aa.theme.dividerColor"
-                        android:title="@string/pref.aa.theme.divider_color" />
-
-                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
-                        android:defaultValue="0xffffffff"
-                        android:key="pref.aa.theme.currentValueColor"
-                        android:title="@string/pref.aa.theme.current_value_color" />
-
-                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
-                        android:defaultValue="0xffff0000"
-                        android:key="pref.aa.theme.inAlertValueColor"
-                        android:title="@string/pref.aa.theme.inalert_value_color" />
-
-                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
-                        android:defaultValue="0xffffffff"
-                        android:key="pref.aa.theme.btn.virtual-screen.color"
-                        android:title="@string/pref.aa.theme.virtual_screen_color"
-                        app:colorChoices="@array/pref.colors" />
-
-                </PreferenceCategory>
-
                 <PreferenceCategory
                     android:title="@string/pref.aa.routines.category"
                     app:singleLineTitle="false">
@@ -1462,6 +1397,69 @@
 
                 </PreferenceCategory>
 
+
+                <PreferenceCategory
+                    android:title="@string/pref.aa.alerting_category"
+                    app:singleLineTitle="false">
+
+                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="pref.aa.alerting.enabled"
+                        android:summary="@string/pref.aa.alerting.enabled_summary"
+                        android:title="@string/pref.aa.alerting.enabled"
+                        app:singleLineTitle="false" />
+
+                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="pref.aa.alerting.legend.enabled"
+                        android:summary="@string/pref.aa.alerting.legend.enabled_summary"
+                        android:title="@string/pref.aa.alerting.legend.enabled"
+                        app:singleLineTitle="false" />
+                </PreferenceCategory>
+
+                <PreferenceCategory android:title="@string/pref.theme">
+                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
+                        android:defaultValue="true"
+                        android:key="pref.aa.theme.background.enabled"
+                        android:title="@string/pref.aa.theme.background.enabled"
+                        app:singleLineTitle="false" />
+
+                    <org.obd.graphs.preferences.aa.AACheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="pref.aa.theme.dynamic-selector.enabled"
+                        android:summary="@string/pref.aa.theme.dynamic_selector.enabled_summary"
+                        android:title="@string/pref.aa.theme.dynamic_selector.enabled"
+                        app:singleLineTitle="false" />
+
+                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
+                        android:defaultValue="0xffff0000"
+                        android:key="pref.aa.theme.progressColor"
+                        android:title="@string/pref.aa.theme.progress_bar_color" />
+
+                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
+                        android:defaultValue="0xffffffff"
+                        android:key="pref.aa.theme.dividerColor"
+                        android:title="@string/pref.aa.theme.divider_color" />
+
+                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
+                        android:defaultValue="0xffffffff"
+                        android:key="pref.aa.theme.currentValueColor"
+                        android:title="@string/pref.aa.theme.current_value_color" />
+
+                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
+                        android:defaultValue="0xffff0000"
+                        android:key="pref.aa.theme.inAlertValueColor"
+                        android:title="@string/pref.aa.theme.inalert_value_color" />
+
+                    <com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat
+                        android:defaultValue="0xffffffff"
+                        android:key="pref.aa.theme.btn.virtual-screen.color"
+                        android:title="@string/pref.aa.theme.virtual_screen_color"
+                        app:colorChoices="@array/pref.colors" />
+
+                </PreferenceCategory>
+
+
                 <PreferenceCategory
                     android:title="@string/pref.aa.debug_category"
                     app:singleLineTitle="false">
diff --git a/automotive/src/main/res/values/strings.xml b/automotive/src/main/res/values/strings.xml
index 81e5ccb4..02ad0ccc 100644
--- a/automotive/src/main/res/values/strings.xml
+++ b/automotive/src/main/res/values/strings.xml
@@ -16,8 +16,8 @@
     <string name="available_features.page_title">Available screens</string>
     <string name="available_features.routine_screen.title">Routines</string>
     <string name="available_features.drag_race_screen.title">Drag Racing</string>
-    <string name="available_features.giulia_screen.title">Metrics</string>
-    <string name="available_features.gauge_screen.title">Gauge</string>
+    <string name="available_features.giulia_screen.title">Metrics - Giulia</string>
+    <string name="available_features.gauge_screen.title">Metrics - Gauge </string>
     <string name="available_features.trip_info_screen.title">Trip Info</string>
 
 </resources>
\ No newline at end of file