Upgraded, added setting for scaled image

Upgraded, added setting to allow scaled image to fit or fill