updated UI and model