Fixed some urls and tweaking the templates