updated styling and templates