Updating gallery and making it a little bit more source agnostic