Merge pull request #142 from mustaquenadim/use-layout-effect

Merge pull request #142 from mustaquenadim/use-layout-effect #705