various work on Menus form, other minor changes