Updated styling and templates