Automation GUI clutter

I’ve been going over my automations lately and improving them. And i’ve noticed that as soon as the automation gets just a tiny bit more advanced, say with a few nested choose action types, i completely loose my overview and where I am. I think that if there where an ability to simply collapse / expand the different elements of the GUI, this would greatly help with the overview. Just a simple thing as turning a light on with the Call service action type, and light.turn_on gives me so many options which just clutter the interface and i don’t need (but love to have when i do ofcourse!)

Any info on if this is being worked on? Or any extensions which can do something like this?