Refactored tables so they render correctly