Reorganized cover a little more
Merge branch 'droponclicks'