code readability
refactor/bugfixes
new class for handling screens
Merge branch 'master' into dev