Margin issues fixed