Revert "Vis UI patchup part 1"
Merge pull request #1726 from isenseDev/revert-1723-jp1621

Revert "Vis UI patchup part 1"