UI and model improvements