Layout

Changed the layout of the tables a bit