Improved formatting of tables