[Task] rewrite margins for offset closes #8