WPHRT-58 Changes related to UI