small changes on templates and comments added in "views"