Lastest tweaks for the table