diff --git a/skin.xrc b/skin.xrc
index bf7da8e..7d077af 100644
--- a/skin.xrc
+++ b/skin.xrc
@@ -668,32 +668,27 @@
                     <flag>wxGROW|wxALL</flag>
                     <border>2</border>
                     <object class="wxFlexGridSizer">
-                        <rows>1</rows>
+                        <cols>2</cols>
                         <growablecols>1</growablecols>
+                        <hgap>5</hgap>
+                        <vgap>5</vgap>
                         <object class="sizeritem">
-                            <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</flag>
                             <object class="wxStaticText">
-                                <label>Name </label>
+                                <label>Name</label>
                             </object>
                         </object>
                         <object class="sizeritem">
-                            <flag>wxGROW</flag>
+                            <flag>wxALIGN_CENTER_VERTICAL|wxGROW</flag>
                             <object class="wxTextCtrl" name="InsuredName">
+                                <hint>Insured full name</hint>
                                 <help>Insured full name</help>
                             </object>
                         </object>
-                    </object>
-                </object>
-                <object class="sizeritem">
-                    <flag>wxGROW|wxALL</flag>
-                    <border>2</border>
-                    <object class="wxFlexGridSizer">
-                        <rows>1</rows>
-                        <growablecols>1,3</growablecols>
                         <object class="sizeritem">
-                            <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</flag>
                             <object class="wxStaticText">
-                                <label>Address </label>
+                                <label>Address</label>
                             </object>
                         </object>
                         <object class="sizeritem">
@@ -703,67 +698,74 @@
                             </object>
                         </object>
                         <object class="sizeritem">
-                            <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</flag>
                             <object class="wxStaticText">
-                                <label>City </label>
+                                <label>City</label>
                             </object>
                         </object>
                         <object class="sizeritem">
                             <flag>wxGROW</flag>
-                            <object class="wxTextCtrl" name="City">
-                                <help>Insured city</help>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-                <object class="sizeritem">
-                    <flag>wxGROW|wxALL</flag>
-                    <border>2</border>
-                    <object class="wxFlexGridSizer">
-                        <object class="sizeritem">
-                            <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-                            <object class="wxStaticText">
-                                <label>State </label>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <flag>wxGROW</flag>
-                            <object class="wxComboBox" name="State">
-                                <help>Insured state</help>
-                                <size>40,-1</size>
-                                <style>wxCB_DROPDOWN|wxCB_READONLY</style>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-                            <object class="wxStaticText">
-                                <label>Zip </label>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <flag>wxGROW</flag>
-                            <object class="wxTextCtrl" name="ZipCode">
-                                <help>Insured ZIP code</help>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-                            <object class="wxStaticText">
-                                <label>Country </label>
-                            </object>
-                        </object>
-                        <object class="sizeritem">
-                            <flag>wxGROW</flag>
-                            <object class="wxComboBox" name="Country">
-                                <help>Country (ISO 3166-1-Alpha-2 code)</help>
-                                <size>40,-1</size>
-                                <style>wxCB_DROPDOWN|wxCB_READONLY</style>
+                            <object class="wxBoxSizer">
+                                <orient>wxHORIZONTAL</orient>
+                                <object class="sizeritem">
+                                    <option>1</option>
+                                    <flag>wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+                                    <border>5</border>
+                                    <object class="wxTextCtrl" name="City">
+                                        <help>Insured city</help>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</flag>
+                                    <border>5</border>
+                                    <object class="wxStaticText">
+                                        <label>State</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+                                    <border>5</border>
+                                    <object class="wxComboBox" name="State">
+                                        <help>Insured state</help>
+                                        <size>40,-1</size>
+                                        <style>wxCB_DROPDOWN|wxCB_READONLY</style>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</flag>
+                                    <border>5</border>
+                                    <object class="wxStaticText">
+                                        <label>Zip</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
+                                    <border>5</border>
+                                    <object class="wxTextCtrl" name="ZipCode">
+                                        <help>Insured ZIP code</help>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</flag>
+                                    <border>5</border>
+                                    <object class="wxStaticText">
+                                        <label>Country</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxGROW</flag>
+                                    <object class="wxComboBox" name="Country">
+                                        <help>Country (ISO 3166-1-Alpha-2 code)</help>
+                                        <size>40,-1</size>
+                                        <style>wxCB_DROPDOWN|wxCB_READONLY</style>
+                                    </object>
+                                </object>
                             </object>
                         </object>
                         <object class="sizeritem">
-                            <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                            <flag>wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT</flag>
                             <object class="wxStaticText">
-                                <label>Employee class </label>
+                                <label>Employee class</label>
                             </object>
                         </object>
                         <object class="sizeritem">