Fixed the remaining issues with screen dynamics