More menu options
Basic functionality implemented