Gallery controller with views
Merge gallery_controller