moving HTML into template files.
Identation fixed for layout HTML.
Merge branch 'feature/templates' into develop

* feature/templates:
  Identation fixed for layout HTML.
  moving HTML into template files.