improve the model Album and the views a little bit