Fixed some of the flashing at pageload