Work on table formatting