Ui/core improvements

Jira issue: HUBWH-6