Refactored dash tabs