extrenlize templates and css
add some comments and refacto
Merge branch 'develop' into release/candidate

* develop:
  add some comments and refacto
  extrenlize templates and css