small fixes: modal close icon, better modal comments
Merge branch 'development'

* development:
  small fixes: modal close icon, better modal comments