added one more important todo: removing the FOUC