Bring Table more in line with list