Small fixes to images and SquareView