Change margin calculation
Prevent breaking the resorts
Use column-gap property