updated Screen and Controller classes