Fix some issues with html
Optimize js
Merge pull request #1 from eugeneglova/bugfix/eugene/html-issues

Bugfix/eugene/html issues