little reorganization and screen vis. change