Rearrangement of tables. Whitespace issues