This whole function is getting very confusing. I think it's time to separate out application settings from device settings. I will work on this and get it pushed soon.