New Template and CSS changes