small fixes to menu and formatting