Improved load time and fixed toolbar flickering