Settings polished