Added Toggle for Margin or Markup
Merge branch 'odell'