First pass on integrating two-way data binding into UVML definitions
UI refactoring