INT-misc-38a9.18: Reworked menu