Revert "UI Action bar cleanup"
Merge pull request #1223 from DroidPlanner/revert-1218-ui_cleanup

Revert "UI Action bar cleanup"