More improvements to table