Fixed Checkbox + a big clean