Optional/Filtered image grouping

Image grouping is a great feature, but when you send images which is long in width and short in height, the grouping makes it harder to view.

My suggestion is to filter which images to group by it's ratio. 

Or alternatively, make the grouping optional.