Fixed issue with rows

Rows were messed up. Fixed before and after as well as clear both