diff --git a/gui/passport/passport.glade b/gui/passport/passport.glade
index 052ffca..79405f8 100644
--- a/gui/passport/passport.glade
+++ b/gui/passport/passport.glade
@@ -290,63 +290,6 @@ Optional Data
-
-
- True
- Document No.
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 5
- 6
- 0
- 1
- fill
-
-
-
-
-
-
- True
- True
- <span size="large"><b>%s</b></span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- True
- 0
-
-
- 5
- 6
- 1
- 2
- fill
-
-
-
-
True
@@ -515,238 +458,6 @@ Machine Readable Zone data
-
-
- True
-
-Issuing State or Organisation
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 5
- 6
- 6
- 7
- fill
-
-
-
-
-
-
- True
- True
- <span size="large"><b>%s</b></span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- True
- 0
-
-
- 5
- 6
- 7
- 8
- fill
-
-
-
-
-
-
- True
- True
- <span size="large"><b>%s</b></span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- 5
- True
- 0
-
-
- 4
- 5
- 7
- 8
- fill
-
-
-
-
-
-
- True
- True
- <span size="large"><b>%s</b></span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- True
- 0
-
-
- 5
- 6
- 11
- 12
- fill
-
-
-
-
-
-
- True
- True
- <span size="large"><b>%s</b></span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- 5
- True
- 0
-
-
- 4
- 5
- 11
- 12
- fill
-
-
-
-
-
-
- True
- True
- <span size="large"><b>%s</b></span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- True
- 0
-
-
- 5
- 6
- 8
- 9
- fill
-
-
-
-
-
-
- True
-
-Nationality
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 5
- 6
- 10
- 11
- fill
-
-
-
-
-
-
- True
- True
- <span size="large"><b>%s</b></span>
- False
- True
- GTK_JUSTIFY_LEFT
- False
- True
- 0
- 0.5
- 6
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- True
- 0
-
-
- 5
- 6
- 12
- 13
- fill
-
-
-
-
True
@@ -918,6 +629,291 @@ Last Name
+
+
+
+ True
+
+Issuing State or Organisation
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 4
+ 6
+ 6
+ 7
+ fill
+
+
+
+
+
+
+ True
+
+Nationality
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 4
+ 6
+ 10
+ 11
+ fill
+
+
+
+
+
+
+ True
+ Document No.
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 4
+ 6
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ True
+ <span size="large"><b>%s</b></span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ True
+ 0
+
+
+ 4
+ 6
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ True
+ True
+ <span size="large"><b>%s</b></span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ 5
+ True
+ 0
+
+
+ 4
+ 5
+ 11
+ 12
+
+
+
+
+
+
+
+ True
+ True
+ <span size="large"><b>%s</b></span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ 5
+ True
+ 0
+
+
+ 4
+ 5
+ 7
+ 8
+
+
+
+
+
+
+
+ True
+ True
+ <span size="large"><b>%s</b></span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ True
+ 0
+
+
+ 5
+ 6
+ 7
+ 8
+
+
+
+
+
+
+ True
+ True
+ <span size="large"><b>%s</b></span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ True
+ 0
+
+
+ 5
+ 6
+ 11
+ 12
+
+
+
+
+
+
+ True
+ True
+ <span size="large"><b>%s</b></span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ True
+ 0
+
+
+ 5
+ 6
+ 12
+ 13
+
+
+
+
+
+
+ True
+ True
+ <span size="large"><b>%s</b></span>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ True
+ 0
+ 0.5
+ 6
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ True
+ 0
+
+
+ 5
+ 6
+ 8
+ 9
+
+
+