Other than Photoshop, the other photo editing program I use is Google's Picasa. I like their collage maker, as it offers several different collage formats and allows for manual editing.

http://picasa.google.com

From the welcome page click on "Discover more features".