[TIMOB-8367] UI Fix
Merge pull request #113 from vishalduggal/timob-8367

[TIMOB-8367] UI Fix