Fixed some issues in Table layout handler