Update UI and fix loading indicator