Fixed draggability (with bugs still)