Fixed bugs with action bar