CSS/HTML cleanup