Small fixes loading image and more encapsulation