Some minor changes
Change name and add menu options