Fix drag and scale