rearanged

Moved everything to have it all looking like in the other menus