Quick fix to the tab navigation