Update to use Yes/No as default text instead of On/Off