Screens update

Looks like not a lot has changed, but what HAS changed might be significant.  This will need a full QA pass before we can mark it validated.