Remove/Add elements now work properly

These wouldn't disable/enable when removing/adding fields

Signed-off-by: Oz Ramos <>