-Fix issues with Show/Hide based on checkboxes