Improved the table layout and fixes #10