Borders and edges should be applied on top level instead of underneath

When an image is cropped then borders applied, they don’t apply where there is an edited part!