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

Jira issue HUBHAC-7