Added better column formatting