revert last commit, update tablet UI changes first