Added manual cropping to more modules