Re-instates ability to dismiss child add view
Merge branch 'feature/dismissal_fixes' into develop

* feature/dismissal_fixes:
  Re-instates ability to dismiss child add view