cleanups in menu.tpl