Album art fixes

 * Simplify code
 * Actually fetch images