simplify main menu
more menu tweaking
annotations