Fixed indenting issues in various templates