UI scheme changes WIP. More commits expected. unstable.