Fixed up some broken stuff and added a link to the subjects view