Extract gallery controller #12