I also use Google's Picasa for viewing/editing my photos. I really like it.
BUT-
When you install it, it will find all photos on your computer automatically. Handy but poses another problem.
They should let you set where it can look first, before it finds all the little img things.
- deleting all the little icon images can take a long time, plus if it finds duplicates...

http://picasa.google.com/