Various template fixes
Merge branch 'dev/drupal' of https://github.com/JohnnyRuvac/The-Data-Matters into dev/drupal