Minor template and view tweaks