[DF-5054] - positions for margins fixed, MacOS-specific changes.