Run menu command later

Theoretically, this *should* work, as we’re providing time for the
previous menu to close.
Move a few classes here and there