Stabilizing no-legacy layout

I think I finally freaking got it