added some nunjucks, some more moving over of stuff from mediaGallery