US #67 - Fix UI and save for boolean properties