fixed menu building, still needs hooking in