[CLC-1396] Display fixes
Merge pull request #971 from yuhunglin/CLC-1396c

[CLC-1396] Display fixes