closes #1507
closes #1447
closes #1427 and tweaks style for add more gallery button
closes #1484
Merge remote-tracking branch 'origin/marianne-sprint' into dev
Merge pull request #1589 from OCHA-DAP/dev-merge

Dev merge