css & template upgrades