Revert "tabletUI fixes"

This reverts commit 8acfd1575b7e51533ad5cb6d0832c5758f627ad0.