refactor(tabs): simpler code, focus fixes