refactored main.html
Merge branch 'master' into production