DnD, Clean Up

Added drag and drop

A couple minor changes