Added option to edit margins