Fix navigation blinking issue and numbers