Maybe make menus work a bit better?