[#2] First batch of template tweaks
[#2] Tweaks to template
[#2] Final tweaks to the templates