Not finished
Merge remote-tracking branch 'work/master'
front end changes for fit to crop