Issue #521 - Bug: Fixing margins

Issue #521 
@MohamedBassem