Merged row-fluid and alt fixes