more work on the organization and school screens