Fixed cancel button for real. Changed image view content mode to aspect fit.