fix bug with destroy being redirected.
increase height of iframe
Merge branch 'master' into development