poor drag and drop
Some minor changes:redirect., updated todo