Pre-nap commit
Fix missing checkbox buttons