Branches added, row-fluid bug fixed