change to fix WEB-164, some other UI updates