Added baseurl to templates