I don’t have any brilliant ideas but I will test it if you’d like. I think keep the plugin simple and functional. The way you have it setup in the screenshots makes a lot of sense.