UI cleanup changes prior to scheduling work