Restructure to avoid flicker in IE10