Updated CSS and template structure