updated templates, and app.css