Html merge

whooooo pretty web stuff <3