Flickr fix
Navigation fix