scaling image implemented
merge conflicts resolved