--- a/src/hugin1/hugin/xrc/cp_editor_panel.xrc
+++ b/src/hugin1/hugin/xrc/cp_editor_panel.xrc
@@ -97,10 +97,30 @@
                   <object class="wxBoxSizer">
                     <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
-                      <object class="wxListCtrl" name="cp_editor_cp_list">
-                        <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
-                      </object>
-                      <flag>wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                      <object class="wxBoxSizer">
+                        <object class="sizeritem">
+                          <object class="wxListCtrl" name="cp_editor_cp_list">
+                            <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
+                          </object>
+                          <flag>wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                          <option>3</option>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticLine" name="ID_STATICLINE1">
+                            <size>-1,-1</size>
+                            <style>wxLI_VERTICAL</style>
+                          </object>
+                          <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_BOTTOM</flag>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxListCtrl" name="cp_editor_line_list">
+                            <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
+                          </object>
+                          <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_BOTTOM</flag>
+                          <option>1</option>
+                        </object>
+                      </object>
+                      <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_BOTTOM</flag>
                       <option>1</option>
                     </object>
                     <object class="sizeritem">
@@ -124,7 +144,8 @@
                           <object class="wxStaticText" name="ID_STATICTEXT2">
                             <label>y:</label>
                           </object>
-                          <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxLEFT|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <border>3</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="cp_editor_y1">
@@ -139,7 +160,8 @@
                           <object class="wxStaticText" name="ID_STATICTEXT3">
                             <label>x:</label>
                           </object>
-                          <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxLEFT|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <border>3</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="cp_editor_x2">
@@ -154,7 +176,8 @@
                           <object class="wxStaticText" name="ID_STATICTEXT4">
                             <label>y:</label>
                           </object>
-                          <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxLEFT|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <border>3</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="cp_editor_y2">
@@ -169,7 +192,8 @@
                           <object class="wxStaticText" name="ID_STATICTEXT5">
                             <label>mode:</label>
                           </object>
-                          <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxLEFT|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <border>3</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxChoice" name="cp_editor_mode">
@@ -180,15 +204,15 @@
                             </content>
                             <size>100,-1</size>
                           </object>
-                          <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-                          <border>3</border>
+                          <flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                          <border>5</border>
                           <option>2</option>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                      <flag>wxTOP|wxBOTTOM|wxEXPAND|wxALIGN_LEFT|wxALIGN_BOTTOM</flag>
                     </object>
                   </object>
-                  <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                  <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
                   <border>3</border>
                   <option>1</option>
                 </object>
@@ -196,14 +220,8 @@
                   <object class="wxBoxSizer">
                     <orient>wxVERTICAL</orient>
                     <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="ID_STATICTEXT6">
-                            <label>Zoom:</label>
-                          </object>
-                          <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
-                          <border>3</border>
-                        </object>
+                      <object class="wxStaticBoxSizer">
+                        <label>Zoom</label>
                         <object class="sizeritem">
                           <object class="wxChoice" name="cp_editor_choice_zoom">
                             <content>
@@ -218,107 +236,108 @@
                             <selection>1</selection>
                           </object>
                           <flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
-                          <option>1</option>
-                        </object>
-                      </object>
-                      <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-                      <border>3</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                        <object class="sizeritem">
-                          <object class="wxButton" name="cp_editor_finetune_button">
-                            <label>Fine-tune</label>
-                            <tooltip>Tries to optimize the currently active point</tooltip>
-                          </object>
-                          <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
-                          <border>3</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxButton" name="cp_editor_celeste_button">
-                            <label>Celeste</label>
-                            <tooltip>Tries to remove control points from clouds</tooltip>
-                          </object>
-                          <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
-                          <border>3</border>
-                        </object>
-                      </object>
-                      <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                          <border>3</border>
+                          <option>1</option>
+                        </object>
+                      </object>
+                      <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_BOTTOM</flag>
                       <border>5</border>
                     </object>
                     <object class="sizeritem">
-                      <object class="wxBoxSizer">
+                      <object class="wxStaticBoxSizer">
+                        <label>Control Points</label>
                         <orient>wxVERTICAL</orient>
                         <object class="sizeritem">
-                          <object class="wxCheckBox" name="cp_editor_fine_tune_check">
-                            <label>auto fine-&amp;tune</label>
+                          <object class="wxBoxSizer">
+                            <object class="sizeritem">
+                              <object class="wxButton" name="cp_editor_finetune_button">
+                                <label>Fine-tune</label>
+                                <tooltip>Tries to optimize the currently active point</tooltip>
+                              </object>
+                              <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                              <border>3</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxButton" name="cp_editor_celeste_button">
+                                <label>Celeste</label>
+                                <tooltip>Tries to remove control points from clouds</tooltip>
+                              </object>
+                              <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                              <border>3</border>
+                            </object>
+                          </object>
+                          <flag>wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                          <border>5</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxBoxSizer">
+                            <orient>wxVERTICAL</orient>
+                            <object class="sizeritem">
+                              <object class="wxCheckBox" name="cp_editor_fine_tune_check">
+                                <label>auto fine-&amp;tune</label>
+                              </object>
+                              <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxCheckBox" name="cp_editor_auto_add">
+                                <label>auto add</label>
+                                <tooltip>immediately add control point when selecting a second point</tooltip>
+                              </object>
+                              <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxCheckBox" name="cp_editor_auto_estimate">
+                                <label>auto estimate</label>
+                                <tooltip>tries to estimate shift between the images and use it while placing control points</tooltip>
+                              </object>
+                              <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                            </object>
                           </object>
                           <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxCheckBox" name="cp_editor_auto_add">
-                            <label>auto add</label>
-                            <tooltip>immediately add control point when selecting a second point</tooltip>
-                          </object>
-                          <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxCheckBox" name="cp_editor_auto_estimate">
-                            <label>auto estimate</label>
-                            <tooltip>tries to estimate shift between the images and use it while placing control points</tooltip>
-                          </object>
-                          <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-                        </object>
-                      </object>
-                      <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                          <border>5</border>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxBoxSizer">
+                            <object class="sizeritem">
+                              <object class="wxButton" name="cp_editor_delete">
+                                <label>&amp;Delete</label>
+                              </object>
+                              <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                              <border>3</border>
+                            </object>
+                            <object class="sizeritem">
+                              <object class="wxButton" name="cp_editor_add">
+                                <label>&amp;Add</label>
+                                <tooltip>add a new Point</tooltip>
+                              </object>
+                              <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                              <border>3</border>
+                            </object>
+                          </object>
+                          <flag>wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+                          <border>5</border>
+                        </object>
+                      </object>
+                      <flag>wxALL|wxALIGN_LEFT|wxALIGN_BOTTOM</flag>
                       <border>5</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                        <object class="sizeritem">
-                          <object class="wxButton" name="cp_editor_delete">
-                            <label>&amp;Delete</label>
-                          </object>
-                          <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
-                          <border>3</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxButton" name="cp_editor_add">
-                            <label>&amp;Add</label>
-                            <tooltip>add a new Point</tooltip>
-                          </object>
-                          <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
-                          <border>3</border>
-                        </object>
-                      </object>
-                      <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-                      <border>5</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                      
-                        <object class="sizeritem">
-                          <object class="wxButton" name="cp_line_pair_add">
-                            <label>Add Line Pair</label>
-                          </object>
-                          <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
-                          <border>5</border>
-                        </object>
+                      <option>1</option>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxStaticBoxSizer">
+                        <label>Straight Lines</label>
                         <object class="sizeritem">
                           <object class="wxButton" name="cp_line_add">
                             <label>Add Straight Line</label>
                           </object>
                           <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
-                          <border>5</border>
-                        </object>
-                      </object>
-                      <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
+                          <border>3</border>
+                        </object>
+                      </object>
+                      <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_BOTTOM</flag>
                       <border>5</border>
-                      <option>1</option>
                     </object>
                   </object>
                   <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-                  <border>3</border>
                 </object>
               </object>
               <flag>wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>