Refactored tabs