Settings enhancement and cleanups