closes #1785
Merge pull request #1832 from OCHA-DAP/dev-dan-40

closes #1785
Merge pull request #1833 from OCHA-DAP/dev

Pull request for merging dev into staging ( menu change #2 ) - sprint 40