Changes to make non required settings in the various tabs to be deletable

Code review : Chezka Arevalo