Menus finally work 100%