Added viewport to the templates