Initial work on a fluid layout
Better fuild layout