Move all HTML to a seperate class