Improved menu performance a bit + fixed failing tests.