Settings edit, cleanup