Settings improvements