webs templates updated, tests and refactored