Wildmenu stuff and a bit of reorganisation