Simpler way of changing screens.

New system also allows more screens.