Add checkbox
Fix states