Fixed dragging and added create to components