Settings improvement