fixing the change for topic name
fixing the underline in data tab
Merge branch 'new-comp' into build-28