added permalinks to clean route
formatted with doc blocks
tweak template
Merge branch 'dev'

* dev:
  tweak template
  formatted with doc blocks
  added permalinks to clean route