Cleaned up the ActionBar code

Changed the code to use the new 'add button' functionality to place the menu
    and back icons. This allows for cleaner code