Fix colspan, tidy up HTML