Cleaned up code

Made it easier to quit out of the menu and general clean up.