Aspect Ratio problem is fixed using cropped images
Merge from Baha