Update album.js working also with a subalbum

... more code cleaning and better coding style