Completed migration of UI controls