Dislike of the new Family Tree

I'm very disapointed with the family tree updated.  Before the update when you clicked on a sim in the family tree it focused on them and their kids.  Now every one is mixed in together, and it's difficult to tell what sims belongs to which family member.  Also newborn babies are not showing until they get to the Infant (2nd) stage.  

Is there a better way to organize/focus on one particular family line without all the extras added in?  Or could a possible improvement be made so that if you select one sim you only see their direct line and not the other relatives?