fix image view fill options
Merge branch 'AlexLocal'