Minor fixes to settings

now correctly handles enabling/disabling of labels