Crop bugfix and code cleaning

- Code more intuitive now
- Fixed bug where app would crash upon leaving mid-crop