#368 Clean up the action bar