3 files changed, 203 insertions, 229 deletions

diff --git a/extensions/uiconfig/sbibliography/ui/generalpage.ui b/extensions/uiconfig/sbibliography/ui/generalpage.ui
index 39c96b7ec50e..51725f55813d 100644
--- a/extensions/uiconfig/sbibliography/ui/generalpage.ui
+++ b/extensions/uiconfig/sbibliography/ui/generalpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="pcr">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkBox" id="GeneralPage">
@@ -19,169 +19,142 @@
           <object class="GtkViewport" id="viewport2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
             <property name="border_width">6</property>
             <child>
               <object class="GtkGrid" id="grid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
                   <object class="GtkLabel" id="shortname">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
+                    <property name="halign">end</property>
                     <property name="label" translatable="yes" context="generalpage|shortname">_Short name</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="authtype">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|authtype">_Type</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="authors">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|authors">Author(s)</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="publisher">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|publisher">_Publisher</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="chapter">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|chapter">_Chapter</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="title">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|title">Tit_le</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="address">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|address">A_ddress</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="pages">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|pages">Pa_ge(s)</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="year">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|year">_Year</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="isbn">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|isbn">_ISBN</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -198,164 +171,136 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="editor">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|editor">Editor</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="booktitle">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|booktitle">_Book title</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">6</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="edition">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|edition">Ed_ition</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="volume">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|volume">Volume</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">6</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="institution">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|institution">Instit_ution</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">7</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="month">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|month">_Month</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="publicationtype">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|publicationtype">Publication t_ype</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">6</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="university">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|university">University</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">7</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="reporttype">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|reporttype">Type of re_port</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="organization">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|organization">Organi_zation</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">7</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -372,102 +317,84 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">9</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="journal">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|journal">_Journal</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">10</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="annotation">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|annotation">Ann_otation</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">11</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="number">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|number">Numb_er</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">10</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="note">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|note">_Note</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">11</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="series">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|series">Se_ries</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">10</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="url">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|url">URL</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">11</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -484,86 +411,71 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">12</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="custom1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|custom1">User-defined field _1</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">13</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="custom4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|custom4">User-defined field _4</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">14</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="custom2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|custom2">User-defined field _2</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">13</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="custom5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|custom5">User-defined field _5</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">14</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="custom3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="xalign">0</property>
                     <property name="label" translatable="yes" context="generalpage|custom3">User-defined field _3</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">1</property>
                   </object>
                   <packing>
                     <property name="left_attach">4</property>
                     <property name="top_attach">13</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
diff --git a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui
index 021ed1aa1d79..f0e455f80fd7 100644
--- a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui
+++ b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui
@@ -105,8 +105,7 @@
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label2">_Short name</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">identifierCombobox</property>
@@ -120,8 +119,7 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label3">_Author(s)</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">authorCombobox</property>
@@ -135,8 +133,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label4">_Publisher</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">publisherCombobox</property>
@@ -150,8 +147,7 @@
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label5">_Chapter</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">chapterCombobox</property>
@@ -165,13 +161,12 @@
                       <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label6">Editor</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                     <child>
@@ -219,15 +214,14 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label7">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label7">_Type</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">authorityTypeCombobox</property>
@@ -241,8 +235,7 @@
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label8">_Year</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">yearCombobox</property>
@@ -256,8 +249,7 @@
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label9">Tit_le</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">titleCombobox</property>
@@ -307,8 +299,7 @@
                       <object class="GtkLabel" id="label10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label10">A_ddress</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">addressCombobox</property>
@@ -322,8 +313,7 @@
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label11">_ISBN</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">ISBNCombobox</property>
@@ -337,8 +327,7 @@
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label12">Pa_ge(s)</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">pagesCombobox</property>
@@ -388,15 +377,14 @@
                       <object class="GtkLabel" id="label13">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label13">Ed_ition</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">editionCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                     <child>
@@ -408,50 +396,47 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">4</property>
+                        <property name="top_attach">5</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label14">_Book title</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">bookTitleCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label15">Volume</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label16">Publication t_ype</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">howPublishedCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">4</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                       </packing>
                     </child>
                     <child>
@@ -463,7 +448,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                       </packing>
                     </child>
                     <child>
@@ -475,7 +460,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                       </packing>
                     </child>
                     <child>
@@ -487,52 +472,49 @@
                       </object>
                       <packing>
                         <property name="left_attach">5</property>
-                        <property name="top_attach">5</property>
+                        <property name="top_attach">6</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label17">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label17">Organi_zation</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">organizationCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label18">Instit_ution</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">institutionCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label19">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label19">Uni_versity</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">schoolCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">4</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                       </packing>
                     </child>
                     <child>
@@ -544,7 +526,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                       </packing>
                     </child>
                     <child>
@@ -556,7 +538,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                       </packing>
                     </child>
                     <child>
@@ -568,37 +550,35 @@
                       </object>
                       <packing>
                         <property name="left_attach">5</property>
-                        <property name="top_attach">6</property>
+                        <property name="top_attach">7</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label20">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label20">Type of re_port</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">reportTypeCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">7</property>
+                        <property name="top_attach">8</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label21">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label21">_Month</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">monthCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">7</property>
+                        <property name="top_attach">8</property>
                       </packing>
                     </child>
                     <child>
@@ -610,7 +590,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">7</property>
+                        <property name="top_attach">8</property>
                       </packing>
                     </child>
                     <child>
@@ -622,52 +602,49 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">7</property>
+                        <property name="top_attach">8</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label22">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label22">_Journal</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">journalCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">8</property>
+                        <property name="top_attach">10</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label23">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label23">Numb_er</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numberCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">8</property>
+                        <property name="top_attach">10</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label24">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label24">Se_ries</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">seriesCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">4</property>
-                        <property name="top_attach">8</property>
+                        <property name="top_attach">10</property>
                       </packing>
                     </child>
                     <child>
@@ -679,7 +656,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">8</property>
+                        <property name="top_attach">10</property>
                       </packing>
                     </child>
                     <child>
@@ -691,7 +668,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">8</property>
+                        <property name="top_attach">10</property>
                       </packing>
                     </child>
                     <child>
@@ -703,50 +680,47 @@
                       </object>
                       <packing>
                         <property name="left_attach">5</property>
-                        <property name="top_attach">8</property>
+                        <property name="top_attach">10</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label25">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label25">Ann_otation</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">annoteCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">9</property>
+                        <property name="top_attach">11</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label26">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label26">_Note</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">noteCombobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">9</property>
+                        <property name="top_attach">11</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label27">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label27">URL</property>
                       </object>
                       <packing>
                         <property name="left_attach">4</property>
-                        <property name="top_attach">9</property>
+                        <property name="top_attach">11</property>
                       </packing>
                     </child>
                     <child>
@@ -758,7 +732,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">9</property>
+                        <property name="top_attach">11</property>
                       </packing>
                     </child>
                     <child>
@@ -770,7 +744,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">9</property>
+                        <property name="top_attach">11</property>
                       </packing>
                     </child>
                     <child>
@@ -782,82 +756,77 @@
                       </object>
                       <packing>
                         <property name="left_attach">5</property>
-                        <property name="top_attach">9</property>
+                        <property name="top_attach">11</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label28">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label28">User-defined field _1</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">custom1Combobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">10</property>
+                        <property name="top_attach">13</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label29">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label29">User-defined field _2</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">custom2Combobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">10</property>
+                        <property name="top_attach">13</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label30">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label30">User-defined field _3</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">custom3Combobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">4</property>
-                        <property name="top_attach">10</property>
+                        <property name="top_attach">13</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label31">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label31">User-defined field _4</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">custom4Combobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">11</property>
+                        <property name="top_attach">14</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label32">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="vexpand">True</property>
+                        <property name="halign">end</property>
                         <property name="label" translatable="yes" context="mappingdialog|label32">User-defined field _5</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">custom5Combobox</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
-                        <property name="top_attach">11</property>
+                        <property name="top_attach">14</property>
                       </packing>
                     </child>
                     <child>
@@ -869,7 +838,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">10</property>
+                        <property name="top_attach">13</property>
                       </packing>
                     </child>
                     <child>
@@ -881,7 +850,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">10</property>
+                        <property name="top_attach">13</property>
                       </packing>
                     </child>
                     <child>
@@ -893,7 +862,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">5</property>
-                        <property name="top_attach">10</property>
+                        <property name="top_attach">13</property>
                       </packing>
                     </child>
                     <child>
@@ -905,7 +874,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">11</property>
+                        <property name="top_attach">14</property>
                       </packing>
                     </child>
                     <child>
@@ -917,7 +886,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
-                        <property name="top_attach">11</property>
+                        <property name="top_attach">14</property>
                       </packing>
                     </child>
                     <child>
@@ -933,6 +902,99 @@
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkBox" id="box3">
+                        <property name="width_request">12</property>
+                        <property name="height_request">12</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">12</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box2">
+                        <property name="width_request">12</property>
+                        <property name="height_request">12</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">9</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box1">
+                        <property name="width_request">12</property>
+                        <property name="height_request">12</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
                       <placeholder/>
                     </child>
                     <child>
diff --git a/sw/uiconfig/swriter/ui/createauthorentry.ui b/sw/uiconfig/swriter/ui/createauthorentry.ui
index 5e2d96736564..71ff623029f3 100644
--- a/sw/uiconfig/swriter/ui/createauthorentry.ui
+++ b/sw/uiconfig/swriter/ui/createauthorentry.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkDialog" id="CreateAuthorEntryDialog">
@@ -7,6 +7,9 @@
     <property name="border_width">5</property>
     <property name="title" translatable="yes" context="createauthorentry|CreateAuthorEntryDialog">Define Bibliography Entry</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -206,8 +209,5 @@
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>