Update UI & Resolve integration issues