reorganised templates and added comments
fix typos
Show properties on collection page
add comments to more pages