Feature/subject leaflets tidy up