better drag and drop, fixed new button