update fluid layout to use correct row, span structure