Adding menu options and removing some comments