Screen changes refined