Revert "fluid layout"

This reverts commit bef500e7307b517161db539370e8189ace491daa.
Revert "Revert "fluid layout""

This reverts commit 21fbd00c0b89a3d3b9752afaebe8d270cf149759.