Improved the table layouts