Combined message
Updated ui logic

Updated class

One more change to the component

updated logic again
Merge branch 'feature1'