Fixed some z-index bugs

and optimized the Image Crop popup