Tabs issue fixed