Template and CSS changes