Refactor tabs #2