Some of the HTML fixes from #6 got lost in git conflicts, this fixes them
Lgtm, @amitosh, please rebase it.
rebased onto 13fa45b29d8c37bbaa5501cf9b25030ea144fa1c
@a2batic Done!
rebased onto dd3f9c75fac7c6186fda170060ab36f094d7a8e3
Pull-Request has been merged by a2batic
Some of the HTML fixes from #6 got lost in git conflicts, this fixes them