Dry out picture uploader modals
Merge branch 'draggables'