First Iteration of HTML fix