a lot of formatting updates, add masonry to all major image results pages
conflict fixes