Fixed the tab problems