[#53348559] Overhauling layout clearing so we can render modals on top of page with a router path