fixed some of the markup to avoid most HTML validator warnings