Updated and fixed menu options to display better