Added a few changes to draw the table correctly.