Also reorgs the popup controls to match what's in the BaseGame template's setup, which should fix editor popups.