Fixing the tab navigation