Resolved ID conflict and updated UI