Get the images to show properly and add some form of timeout