Fix: Update for new Tabs
Fix: updated for new tabs