Template and CSS update