WIP to get better table layout