UI fixing
Merge remote branch 'upstream/develop' into develop
Fixed incorrect UI component name
Merge remote branch 'upstream/develop' into develop
Merge pull request #27 from ssamartyn/develop

Fixed incorrect UI component name