Layout improvements
Flickr tagging fix