Table layout fixes