Cohort Management: FED/UI Clean up

This work addressing some loose ends with cohort management UI and Front End rendering.