Fix FOUT
New UI model