Minor front-end cleanup
Minor menu cleanup