cleanup and add references
tentative better menu rendering