formatting
formatting and layout.
Change links to spans