Many updates to complete the UI