Fix bug and add function

Fix adding button not working; Add new field in status to determine
which field to be disabled