App: refactor modal
i
q:
Merge branch 'creating' into dev