Major reorganisation of screen handling.

52 files changed