UI no longer has controller references, added some events