Montage fix

This one looks better. It makes some small fixes to your PR.
@wmvanvliet did you have a chance to play with this montage? I think here was an issue with the orientation, I might be wrong.