Fix image aspect ratio
Migrate type to use scope