Arranged with new UI, added 'and' and 'or' functions

Jira issue HUBHAC-7
Merge pull request #11 from dventura3/HUBHAC-7

Arranged with new UI, added 'and' and 'or' functions