reorganization and spinner fixes