Fixes to templates page