added indents to keep thtml file more organized; and made few view changes to style file
Merge branch 'master' into gh-pages