You could always try the google version.

Go to the google homepage & create an account.
They have a free programme called Picasa. From there you can organise the photos on your computer & create web albums.
I've been fiddling around with the programme for a few days & it seems to doing the job.
Best of all - it has a 1Gb of free storage.