- Add nonces where missing - Add status import messages - Move multiple menu handling code to menu class