More progress on CLITabSelectionView.