Updated Screen classes to modern implementation