Removed html tails and fixed class names

Closes #3
Closes #4