Henrik Reitan #012
Further improvement on gallery/camera