wip/flickr: Some aestetical changes