After sitting on this, I like the new design. I will create a new ticket to change the design. It still needs to be div based and not a table though.