Fixed colspan error which was causing table border issues.

Updated a bit of CSS in the process, just to simplify.