Plan screens improvements.