Improve Screen-Player relationship and workflow

Bigger improvements planner for the future but this should help smooth
things out for now.