Sams branch

There are, what I assume to be, javascript issues with my branch. Be sure to check that merging doesn't screw up the album page.