Updated CSS and templates