Refactor html and prettified it up a bit