HTML/CSS cleanup by Dustin Do