added some reorganization of screens