fixes for fluid layout