Improved setup selection screen

I feel like I ask for this every year but with no success. The current setup selection screen in the pit garage is a poor UI experience.

Currently all the setups are listed in the order they were saved, all in one long list. I would like, at a bare minimum, for a filter to be available. Or just that the setups saved on the track you're at to be at the top of the list. A more detailed implementation would include these features, but also have a sort function. Additionally, the ability to have somewhat of a file structure would be neat, allowing for multiple setups to per track to be manageable. For example, the setups menu has the complete list of tracks available, such that you can enter the track you desire > save setup with name; you could then have as many as you desire - for different game modes (GP, my team, ranked, etc.), track conditions etc.