Changed order of the menu to encourage upload and planning