UI Reboot

Remembering UI coding rules...