A few basic template tweaks