CM21 Integration; UI adjustment