moved the dropzone stuff from display to base
Merge branch 'master' into stable