Small lyaout improvement
Fix problems with cropping