Updated UI to comply with Hilary#421
Updated contentType where necessary
Merge pull request #2657 from nicolaasmatthijs/issue-421

Follow up for Hilary#421
Merge remote-tracking branch 'origin/newframework' into contentcomments
Fixes per review