Fixing navigation issues with Tab Titles