Moved some menu layout around