Refactor table layout to take advantage of auto-formatting and (hopefully) be more extensible