fixing the underline in data tab
fixing the position of search bar
fixing minor bugs
Merge branch 'new-comp' into build-28