Margin Fix and cleanup