Added loading and notfound templates