Fix scaling
Restore crop moving