Two modes, one consistent workspace

These are full-resolution captures from the release candidate, not concept art.