fix organizer section, lots of tweaking