Fixed #44.
Also removed unused tags from html.