Issues with the tabs fixed