Refactoring Settings Edit/Delete