Little more cleanup to the html