Use correct semantic html tags, and update CSS