Fluid layout

Fixes issue #5