#12 Partially fix image boundaries insertion in the arrangement
#21 Some progress ...