feat: implement modal
Merge branch 'develop' into developer