Issue #521 - Fix margin bugs
Merge pull request #523 from ndomar/bugFix_#521

Issue #521 - Bug: Fixing margins