Fixing issue with images not scaling correctly