adding drag and drop, cleaning up some html