Initial work on a fluid layout