Removed more tables where they aren't required. Improved table layout.