Use correct overridden method for ActionBar
Remove tablet specific conditionals and layouts