Fixed aspect ratio issue
Merge request fixes