Fixed Margins

Fixed the margins and added a default margin for the object.