Fix toolbar text being cutoff
Fix refresh and remove unnecessary delay on closing the drawer