Fixed Cancelling the change name prompt changes it to null
Sorting and toggle container set up