changed stuff from user feedback on menu