Fixing up table a bit