fixed some menu return bugs