Add / Edit Settings now works completely