after roll back

working version. with new row layout.