reorg menu, fixed crash

hopefully clearer