added albums in artist-view and a little cleanup