Cleaning up html, adding accessibility