Flicker mang & Nav restart