Reorganize NXT menu & fixes