More content template tweaks