Tidied up the django template for the annotation page. Split different parts into sub-templates. It contained overlapping blocks and was too messy to be maintained properly.
Merge branch 'master' of github.com:kcl-ddh/digipal