Fixed the margin calculation with collapsed and moved in columns