Step 4 Router and fix checkbox toggle issue