General Updates
Fix for the checkbox and sorting