This still isn't ideal, but a bit better than before, it just tweaks the order of block processing so that at least the buttons on top of other buttons get processed first. The actual fix will be quite tricky, not sure about how best to do that so far..