More table wrangling. It looks nice now.