Fixed d&d directive look and behavior, (still need to work on the controller)