refactor
tab adding logic refactor
ui refactoring
ui refactoring