Introduce Screen handling. Also other changes made.