cpt-ui updates, not done
fixes conclicts