Upgrade screen toggleable.

That took quite a bit.
Minor stuff?