Implements setting to change top margin
Merge branch 'issues/11'