Another minor revision preparing GUI for Modes panels