Updated form order and tagification

AFDP-75 - created tag for fields, changed the order of the fields, added focus call to first input element on modal load