Yes now it works! That's a totally valid decision to fix it. And I actually like it, glad that you have been able to fix it :) For the extra window, it's fine, doesn't matter
