move some code to its proper place and add a default image for album