Fixed the Nav flashing issue