some small changes?
merge conflicts
search is working again, minor style modification, visitGallery still buggy