redesign v1

jira issue: HUBHAC-10
Merge pull request #9 from pankuleczka/redesign

redesign v1