AddContactDialog UI update

• Closes #276 (closed)
• Closes #287 (closed)
• Might close #280 (closed), this change-set reorders the textinputs to match the android app's order, not exactly the swap outlined in this ticket.