Refine toggle component & add dragging