New menu layout

Moved some things around a bit, a more logical order now.