Template layout changes