Bug fixes & better draggable