Fixes for Action Bar