Refactored sortable component