diff --git a/res/drawable/ic_baseline_departure_board_24.xml b/res/drawable/ic_baseline_departure_board_24.xml
new file mode 100644
index 0000000..0104e53
--- /dev/null
+++ b/res/drawable/ic_baseline_departure_board_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16,1c-2.4,0 -4.52,1.21 -5.78,3.05 0.01,-0.01 0.01,-0.02 0.02,-0.03C9.84,4 9.42,4 9,4c-4.42,0 -8,0.5 -8,4v10c0,0.88 0.39,1.67 1,2.22L2,22c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22v-3.08c3.39,-0.49 6,-3.39 6,-6.92 0,-3.87 -3.13,-7 -7,-7zM4.5,19c-0.83,0 -1.5,-0.67 -1.5,-1.5S3.67,16 4.5,16s1.5,0.67 1.5,1.5S5.33,19 4.5,19zM3,13L3,8h6c0,1.96 0.81,3.73 2.11,5L3,13zM13.5,19c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM16,13c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM16.5,4L15,4v5l3.62,2.16 0.75,-1.23 -2.87,-1.68z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_map_24.xml b/res/drawable/ic_baseline_map_24.xml
new file mode 100644
index 0000000..ffd9dd9
--- /dev/null
+++ b/res/drawable/ic_baseline_map_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>
diff --git a/res/drawable/ic_favorite_heart.xml b/res/drawable/ic_favorite_heart.xml
new file mode 100644
index 0000000..2d9d13c
--- /dev/null
+++ b/res/drawable/ic_favorite_heart.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/res/drawable/ic_star_filled_white.xml b/res/drawable/ic_star_filled_white.xml
new file mode 100644
index 0000000..75d337d
--- /dev/null
+++ b/res/drawable/ic_star_filled_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z"/>
+</vector>
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index d1a3489..63e13a8 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,182 +1,184 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/mainActivityLayout"
     android:orientation="vertical"
 
     tools:context="it.reyboz.bustorino.ActivityMain">
 
     <androidx.appcompat.widget.Toolbar
         xmlns:app="http://schemas.android.com/apk/res-auto"
 
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
+        android:layout_height="wrap_content"
         android:background="?attr/colorPrimary"
         android:elevation="4dp"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         android:id="@+id/that_toolbar"
+        android:fitsSystemWindows="true"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/activity_vertical_margin">
 
     <ImageButton
         android:id="@+id/QRButton"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="30dip"
         android:layout_height="30dip"
         android:layout_alignBottom="@+id/searchButton"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         android:background="@drawable/qrcode_button_custom"
         android:contentDescription="@string/qrcode"
         android:onClick="onQRButtonClick" />
 
     <EditText
         android:id="@+id/busStopSearchByIDEditText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
         android:layout_marginLeft="5dip"
         android:layout_marginRight="5dip"
         android:layout_toEndOf="@+id/QRButton"
         android:layout_toLeftOf="@+id/searchButton"
         android:layout_toRightOf="@+id/QRButton"
         android:layout_toStartOf="@+id/searchButton"
         android:ems="10"
         android:hint="@string/insert_bus_stop_number"
         android:imeOptions="actionSearch"
         android:inputType="number"
         android:selectAllOnFocus="true"
-        android:singleLine="true">
+        android:singleLine="true"
+        >
 
         <requestFocus />
     </EditText>
 
     <!--android:layout_alignParentLeft="true"
     android:layout_alignParentStart="true"-->
     <EditText
         android:id="@+id/busStopSearchByNameEditText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="5dp"
         android:layout_marginLeft="5dip"
         android:layout_marginRight="5dip"
         android:layout_toEndOf="@+id/QRButton"
         android:layout_toLeftOf="@+id/searchButton"
         android:layout_toRightOf="@+id/QRButton"
         android:layout_toStartOf="@+id/searchButton"
         android:ems="10"
         android:hint="@string/insert_bus_stop_name"
         android:imeOptions="actionSearch"
         android:singleLine="true"
         android:visibility="gone">
 
         <requestFocus />
     </EditText>
 
     <ImageButton
         android:id="@+id/searchButton"
         style="?android:attr/borderlessButtonStyle"
         android:layout_width="40dip"
         android:layout_height="40dip"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignTop="@+id/busStopSearchByIDEditText"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
         android:background="@drawable/search_button_custom"
         android:contentDescription="@string/search"
         android:onClick="onSearchClick" />
 
     <ProgressBar
         android:id="@+id/progressBar"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentStart="true"
         android:layout_below="@+id/searchButton"
         android:layout_marginEnd="16dp"
         android:layout_marginLeft="16dip"
         android:layout_marginRight="16dp"
         android:layout_marginStart="16dip"
         android:indeterminateOnly="true"
         android:visibility="gone" />
 
     <TextView
             android:id="@+id/howDoesItWorkTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:layout_marginEnd="16dp"
             android:layout_marginLeft="16dip"
             android:layout_marginRight="16dp"
             android:layout_marginStart="16dip"
             android:layout_toLeftOf="@+id/hideHintButton"
             android:layout_toStartOf="@+id/hideHintButton"
             android:text="@string/howDoesItWork"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/blue_500"
             android:visibility="gone" android:layout_below="@+id/searchButton"/>
 
     <Button
         android:id="@+id/hideHintButton"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="85dip"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/howDoesItWorkTextView"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
         android:background="@drawable/route_background_bus"
         android:onClick="onHideHint"
         android:text="@string/hint_button"
         android:textColor="@color/grey_100"
         android:textSize="19sp"
         android:visibility="gone" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/listRefreshLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/howDoesItWorkTextView"
         android:animateLayoutChanges="true"
         android:visibility="gone">
 
         <FrameLayout
                 android:layout_width="match_parent"
                 android:id="@+id/resultFrame"
                 android:layout_height="fill_parent"
                 android:layout_alignParentLeft="true" android:layout_alignParentStart="true"/>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/floatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
             android:onClick="onToggleKeyboardLayout"
             android:src="@drawable/alphabetical"
             fabSize="normal"
             backgroundTint="@color/teal_500"
             rippleColor="@color/teal_300"
             elevation="15dp"
 
     />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/nav_header.xml b/res/layout/nav_header.xml
new file mode 100644
index 0000000..c03c443
--- /dev/null
+++ b/res/layout/nav_header.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/grey_100"
+    android:padding="16dp"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:gravity="bottom">
+
+    <ImageView
+        android:id="@+id/nav_img"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:minHeight="40dp"
+        app:srcCompat="@drawable/ic_mars2020" />
+
+    <TextView
+
+        android:layout_width="match_parent"
+
+        android:layout_height="wrap_content"
+
+        android:text="@string/app_name"
+
+        android:textAppearance="@style/ThemeOverlay.AppCompat.Light"
+        android:textSize="20sp"
+ />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/new_main_activity.xml b/res/layout/new_main_activity.xml
index 7c45710..f2704b6 100644
--- a/res/layout/new_main_activity.xml
+++ b/res/layout/new_main_activity.xml
@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_height="match_parent">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
     <!-- The ActionBar displayed at the top -->
 
         <include
             layout="@layout/default_toobar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
         <!-- The main content view where fragments are loaded -->
 
         <FrameLayout
             android:id="@+id/mainActContentFrame"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
     </LinearLayout>
 
     <com.google.android.material.navigation.NavigationView
 
         android:id="@+id/nvView"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:background="?attr/colorPrimaryDark"
         android:theme="@style/ThemeOverlay.AppCompat.Dark"
-        app:insetForeground="@color/grey_100"
+        app:headerLayout="@layout/nav_header"
+        app:insetForeground="@color/teal_200"
+        app:itemIconTint="@color/teal_200"
+        app:itemTextAppearance="?android:attr/textAppearanceMedium"
+        app:itemTextColor="@android:color/white"
+        android:fitsSystemWindows="true"
         app:menu="@menu/drawer_main" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/res/menu/drawer_main.xml b/res/menu/drawer_main.xml
index fc30055..0b6840e 100644
--- a/res/menu/drawer_main.xml
+++ b/res/menu/drawer_main.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_arrivals"
+            android:icon="@drawable/ic_baseline_departure_board_24"
             android:title="@string/nav_arrivals_text" />
         <item
             android:id="@+id/nav_map_item"
+            android:icon="@drawable/ic_baseline_map_24"
             android:title="@string/nav_map_text" />
         <item
             android:id="@+id/nav_favorites_item"
+            android:icon="@drawable/ic_star_filled_white"
             android:title="@string/nav_favorites_text" />
     </group>
 
 </menu>
\ No newline at end of file
diff --git a/res/values-v19/styles.xml b/res/values-v19/styles.xml
new file mode 100644
index 0000000..5f8f81e
--- /dev/null
+++ b/res/values-v19/styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
+
+        <item name="android:windowTranslucentStatus">false</item>
+
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/ActivityPrincipal.java b/src/it/reyboz/bustorino/ActivityPrincipal.java
index bba046d..6f40bb7 100644
--- a/src/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/src/it/reyboz/bustorino/ActivityPrincipal.java
@@ -1,113 +1,126 @@
 package it.reyboz.bustorino;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.NavUtils;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 
 import com.google.android.material.navigation.NavigationView;
 
 import it.reyboz.bustorino.middleware.GeneralActivity;
 
 public class ActivityPrincipal extends GeneralActivity {
     private DrawerLayout mDrawer;
     private NavigationView mNavView;
     private ActionBarDrawerToggle drawerToggle;
+    private final static String DEBUG_TAG="BusTO Act Principal";
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.new_main_activity);
 
         Toolbar mToolbar = findViewById(R.id.default_toolbar);
         setSupportActionBar(mToolbar);
-
-        //getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        if (getSupportActionBar()!=null)
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        else Log.w(DEBUG_TAG, "NO ACTION BAR");
 
 
         mDrawer = findViewById(R.id.drawer_layout);
         drawerToggle = setupDrawerToggle(mToolbar);
 
         // Setup toggle to display hamburger icon with nice animation
         drawerToggle.setDrawerIndicatorEnabled(true);
 
         drawerToggle.syncState();
+        mDrawer.addDrawerListener(drawerToggle);
+
         mNavView = findViewById(R.id.nvView);
 
         setupDrawerContent(mNavView);
 
 
     }
     private ActionBarDrawerToggle setupDrawerToggle(Toolbar toolbar) {
         // NOTE: Make sure you pass in a valid toolbar reference.  ActionBarDrawToggle() does not require it
         // and will not render the hamburger icon without it.
         return new ActionBarDrawerToggle(this, mDrawer, toolbar, R.string.drawer_open,  R.string.drawer_close);
 
     }
     private void setupDrawerContent(NavigationView navigationView) {
         navigationView.setNavigationItemSelectedListener(
                 menuItem -> {
 
                     //selectDrawerItem(menuItem);
+                    Log.d(DEBUG_TAG, "pressed item "+menuItem.toString());
 
                     return true;
 
                 });
 
     }
 
 
     // `onPostCreate` called when activity start-up is complete after `onStart()`
     // NOTE 1: Make sure to override the method with only a single `Bundle` argument
     // Note 2: Make sure you implement the correct `onPostCreate(Bundle savedInstanceState)` method.
     // There are 2 signatures and only `onPostCreate(Bundle state)` shows the hamburger icon.
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         drawerToggle.syncState();
     }
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         // Pass any configuration change to the drawer toggles
         drawerToggle.onConfigurationChanged(newConfig);
 
     }
     @Override
 
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
+        int[] cases = {R.id.nav_arrivals, R.id.nav_favorites_item};
+
         switch (item.getItemId()){
             case android.R.id.home:
                 mDrawer.openDrawer(GravityCompat.START);
                 return true;
 
+            case R.id.nav_arrivals:
+                //do something
+                break;
+            default:
+
         }
 
         if (drawerToggle.onOptionsItemSelected(item)) {
 
             return true;
 
         }
         return super.onOptionsItemSelected(item);
 
     }
 
     @Override
     public void onBackPressed() {
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
         else
             super.onBackPressed();
     }
 }