Issues fixed

*apc-37
*apc-25
Merge branch 'origin/fixing-issue-UI'