improving semantics vs presentation

Pull in these changes. Make the rest of the markup semantic and we can review end of day.