Agree, that's the start of the refactoring work for the StateController. It becomes sidebar and viewmode can be either pulled out entirely, or repurposed.