Make input boxes easier to use, add extra fields for identifier select.