Some tidying up and added a more relevant image if no album art is avaliable