Template layout tweaks