Changed the App Nar Buttons to use the switch statement, added App Bar Buttons for new pages