Updated CSS and templates (for real this time)