Fix order to correct in case no menu and have menu