Re-enabled image search
Showing all images on the image home page
Resolve merge conflicts