Fixed various templates