Fixing a few view/template errors