BRANCH 4.2-DEV: added improvements to the gallery