cms UI refactor 50%