cleanup, menu fixes, both user menus working now