Margin fix #7