Discussion comment redesign

Will write up comments in a minute