Rearrange tables

Rearrange tables so that the page is more efficiently used.