Update UI and added functionality