Improve HTML Efficiency

Use 1 DIV instead of two.
Improve HTML Efficiency

More suitable class name
Fix indentation
Merge pull request #287 from Wopian/master

Improve HTML Efficiency