Custom Tabs fix