More work on table formatting