Making Tabs more dynamic