cleaning up html, laying out css more