updated fluid rows
Merge branch 'staging'