UI engine tweaks, manager rewrite