FB-17674: improved gallery