No decorators, back to components again.
Screen boundaries werken nu weer, beetje cleanup.