Fix Clearing+Block-grid margin issue