JS reorg for album/iamges+bug fixes for album