Cleanup album templates. Provide a somewhat "cleaner" look. Refs #63

This is an first attempt to implement the changes I described in issue #63. I also reformatted the source to have proper indenting.