Model Builder Auto-layout degradation in 3.5

[LindsayRaabe_FPCWA]

Hi All. Has anyone else noticed that after upgrading to 3.5 (could be 3.4, but we skipped that version), that the Auto Layout function produces a less well displayed result? You can see in my screenshot below an existing model that was created with a previous version. If I open in 3.5 and click Auto Layout, it condenses all the groups, resulting in overlapping boxes which are harder to discern. And it's not just the grouping boxes that overlap, but they in turn also impinge on tools, resulting in no white-space around them (top row of tools for example). 

I can't figure out how to change this if it's a settings thing. But even if I can, it's still kind of annoying that it's happened. 

[LindsayRaabe_FPCWA]

Yes, I didn't flag it with Esri, but I've also found that model builder would automatically apply auto layout after making a change to a tool, which is really annoying. I only want it to auto layout when I'm ready. I would have to mentally remap my model every time things changed. The only way I found to avoid this was to move the tool I needed to modify out of the group, change it, then move it back into the group.