Remove cfp + minor ui fixes