Flicker on app load fix