Tried to fix the layout problem we got

...When merging, but I give up.