fixes to topmenu, menuitem; still broken, but better