Bug fixed and enhancements

Merge with Picasa embeder
Update screenshots