some more fixes to fluid layout