Fix issue with missing images and improve configuration