More moving around. Bux fixes. And new GUI.