refactor/bugfixes
new class for handling screens