less cleanup, changes to menu structure in html