Minor menu clean-up and bug fixes