Fix table design