Draw and re-order the entire form for japanese

Change-Id: I841e574b094237ecdc380876fbf21b2dd04a0361
Add department to addresses

This is appearently a required thing for addresses in japan

Change-Id: If363b9fbc88e22e5df6082f5c6d2fae4a596a53c
Revert "Add department to addresses"

This reverts commit d6e90ae0fa348ed400b6ad74f407145f69ade4d8.

Change-Id: Ifa6fc6c53f875ed4e80588244c8d1f5dbfda5191