Screens - finished threading fixes