added new views and template factory