Revert "remove TableLayout dependency"

This reverts commit 94b218b6b628adc353119cc3c4ed95cf2c4ff1ac.