Removed some of the color flickering on load