Some drag and drop fixes, updated .proto