Small updates to UI and backend code