address inconsistent margins (bug 1058466)
Merge pull request #630 from spasovski/margins

address inconsistent margins (bug 1058466)