Fix row layout
Cleanup row borders