Replace block__flush-top/bottom with margin utilities