Ui style improvements

Jira issue: HUBWH-6