Fix drag and drop
Update floating for better flexibility