Merge branch 'hotfix/edit_pages'

* hotfix/edit_pages:
  edited
top margin added
Merge branch 'hotfix/top_margin_in_pages' into develop

* hotfix/top_margin_in_pages:
  top margin added