[wip] Fluid layout

Work in progress #1050