Ui style improvements

Jira issue: HUBWH-6
Merge pull request #6 from steverc/HUBWH-6-uiImprovement

Ui style improvements