bugfixes, reorg menu order.