Improve montage