#55 Change screen mechanism refactor