Refactoring tabs widget, fix