Fixed major bug with "Add Number" form, minor improvements in forms