Screen security improvements