Updates to UI and data handling