Fix up showing of change in setting
Small changes and fixes