Working on settings editing