VID-1976 more gallery front end refactor