temp commit with fixes for screen-changing Chrome glitch