Modified UI
Modified the data model for binding