Moved some menu options around a bit.