Feature/action bar tweaks