Use ImageRect instead of sprite, more cleanup