Bug fixing (nb still a little buggy when loading a new image)