Improve organizer alignment