Changing to Menu System

I have changed from buttons to menu options, so its easy to add more
options.