UI Upgrade

TODO: have events use methods