Added more templates, and static files