cleaned up menu

menu items are ordered a bit more according to their relationships