From 34b02d3caae57cbfc615b04483f7fea1912addae Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 11 十一月 2024 22:42:27 +0800
Subject: [PATCH] 调整页面布局

---
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def                                               |   10 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def                                      |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def                                     |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def                                            |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def                                                  |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListCompareVersionPPA_OnSelectionChanged.def     |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def                                             |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS#5.def                                                       |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListBaseVersionPPA_OnSelectionChanged.def        |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainPanel#77.def                                                                      |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelEntitys_OnCreated.def                         |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/_ROOT_Component_FormOfflinePlanChanges#701.def                                                   |    4 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def                                            |   11 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def                                                                  |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsEndDate_OnChanged.def                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def                              |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bComparison_OnClick.def                                                  |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProduct_OnCreated.def                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainRight#593.def                                                   |   15 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelProduct_OnCreated.def                         |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListBaseVersionPP_OnSelectionChanged.def          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslMQBMLB_OnCreated.def                                   |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def                                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def                                                    |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListCompareVersionCurve_OnSelectionChan.def    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def                                                |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListBaseVersionIDS_OnSelectionChanged.def          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_bSelectionChecks687_OnClick.def                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def                                                            |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/_ROOT_Component_FormOfflinePlanComparison.def                                  |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def                                                                    |   12 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def                                                                        |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def                                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslGeneration_OnCreated.def                                            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhComparisonData_OnDataChanged.def                   |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhEndDate_OnCreated.def                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pRibbon.def                                                                            |   16 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckUnits_OnDataChanged.def                                      |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinelProducts_OnCreated.def                                       |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def                                                           |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def                                                       |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve#639.def                                                   |   16 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_rbgTimeUnit_OnUserChanged.def                                            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedProducts_OnDataChanged.def            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def                |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def                                                               |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainPanel#767.def                                                        |   16 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def                                                                 |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixeditorContextMenuDemandComparison#1.def                             |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhStartDate_OnCreated.def                                  |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_dhBaseVersionPP_OnDataChanged.def                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinalUnits_OnCreated.def                                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def                                                    |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter#137.def                                                       |   25 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainPanel#549.def                                                   |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def                                                     |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedProduct_OnDataChanged.def                   |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def                                        |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pAnnualPlanReport#439.def                                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def                                   |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def                                                                 |   10 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhTable_OnDataChanged.def                                           |   16 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def                                                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslGeneration_OnCreated.def                               |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def                                                                  |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def                                                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def                                                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixeditorContextMenuDemandComparison#1.def                                          |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bExport_OnClick.def                                                      |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsEndDate_OnChanged.def                                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPP_OnChanged.def                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR#478.def                                                      |   20 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonFilter676_OnClick.def                                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def                                        |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxIDS_OnChanged.def                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListBaseVersionBudget_OnSelectionChang.def    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_dhBaseVersionBudget_OnDataChanged.def                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def                                                  |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter.def                                                      |   24 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def                                              |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def                                                       |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor.def                                                     |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763#184.def                                               |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def                                                            |   12 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def                                                                 |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_bSelectionChecks422_OnClick.def                        |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhEndDate_OnCreated.def                                                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def                                                  |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pRibbon.def                                                          |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def                                |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslPower_OnCreated.def                                                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_rbgTimeUnit_OnUserChanged.def                      |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection#985.def                                                    |   21 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedProducts_OnDataChanged.def                                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainLeft#250.def                                                         |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhTimeUnit_OnCreated.def                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhStartDate_OnCreated.def                                               |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsStartDate_OnChanged.def                                  |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def                                                               |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def                                               |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def                                               |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def                                                    |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pRibbon#981.def                                                           |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation.def                                                        |   62 +
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison#822.def                                                 |   20 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonClearFilter_OnClick.def                                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonFilter458_OnClick.def                               |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pOfflinePlanComparison.def                                           |   26 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pOfflinePlanChanges.def                                                                |   26 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxBudget_OnChanged.def                      |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA#497.def                                                     |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP#270.def                                                      |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_bSelectionChecks703_OnClick.def                       |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinalUnits_OnCreated.def                     |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def                                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedEntitys_OnDataChanged.def                   |    4 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def                                                     |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListCompareVersionIDS_OnSelectionChanged.def       |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedSalesSegments_OnDataChanged.def                            |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainLeft#577.def                                                                      |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainRight#813.def                                                        |   15 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListBaseVersionCurve_OnSelectionChanged.def    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslGeneration_OnCreated.def                              |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_bSelectionChecks700_OnClick.def                           |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison.def                          |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListCompareVersionPR_OnSelectionChanged.def       |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def                                                    |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks#369.def                                              |   16 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def                                                                             |   12 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsStartDate_OnChanged.def                                               |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPPA_OnChanged.def                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def                                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def                                                        |   20 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsEndDate_OnChanged.def                                                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def                                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def                                               |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslPower_OnCreated.def                                   |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixEditorActionBarPageDemandComparison#1.def                                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinelProducts_OnCreated.def                  |   16 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def                                                                            |   12 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def                                                  |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def                                                               |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListBaseVersionPR_OnSelectionChanged.def          |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def                                                                         |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPR_OnChanged.def                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhTable_OnDataChanged.def                      |   16 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def                                                               |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonClearFilter_OnClick.def                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckUnits_OnDataChanged.def                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhComparisonData_OnDataChanged.def                   |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsStartDate_OnChanged.def                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def                                             |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixEditorActionBarPageDemandComparison#1.def                           |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxCurve_OnChanged.def                       |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged.def                   |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504#265.def                                               |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhXMLDataListener_OnDataChanged.def                |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft#545.def                                                    |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bComparison_OnClick.def                            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_bSelectionChecks253_OnClick.def                          |    6 
 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonMaintainArchivedFiles_On.def |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged.def              |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def                                                   |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListCompareVersionPP_OnSelectionChanged.def       |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def                                               |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhEndDate_OnCreated.def                                    |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def                                             |   10 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def                                   |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation#411.def                                                |   14 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def                                                 |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhStartDate_OnCreated.def                                 |    2 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def                                                             |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_bSelectionChecks289_OnClick.def                            |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison.def                        |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedSalesSegments_OnDataChanged.def       |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def                                  |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListCompareVersionBudget_OnSelectionCh.def    |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def                                                            |   17 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslMQBMLB_OnCreated.def                                                |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def                                                            |   12 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhTimeUnit_OnCreated.def                                                 |    4 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504.def                                                                     |   28 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def                                                                |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def                                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def                                       |   17 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bExport_OnClick.def                                |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainRight#470.def                                                                     |   15 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter#490.def                                                                    |   24 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget#753.def                                                  |   16 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslMQBMLB_OnCreated.def                                  |    2 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor#298.def                                                      |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslPower_OnCreated.def                                    |    6 
 /dev/null                                                                                                                                      |   26 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def                                                                         |   12 
 _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_dhXMLDataListener_OnDataChanged.def                         |    6 
 _Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor#368.def                                                                   |   20 
 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def                                                    |   20 
 202 files changed, 1,276 insertions(+), 677 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def
index ad5b573..83df532 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ActionBarGroupRestraint.def
@@ -38,6 +38,17 @@
         Taborder: 2
       ]
     }
+    Component ButtonMaintainArchivedFiles
+    {
+      #keys: '[414996.1.213680180]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'DOCUMENTS_GEAR'
+        Label: 'Maintain archived files'
+        Taborder: 3
+      ]
+    }
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonMaintainArchivedFiles_On.def b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonMaintainArchivedFiles_On.def
new file mode 100644
index 0000000..17fec20
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Response_MacroPlanner_ActionBarGroupRestraint_ButtonMaintainArchivedFiles_On.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+#parent: ActionBarGroupRestraint/ButtonMaintainArchivedFiles
+Response OnClick () id:Response_MacroPlanner_ActionBarGroupRestraint_ButtonMaintainArchivedFiles_OnClick
+{
+  #keys: '[414996.1.213680372]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebButton_OnClick'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      dlg := construct( DialogMaintainArchivedFiles );
+      dlg.Create();
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def
index d37216a..a680278 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogMaintainArchivedFiles/_ROOT_Component_DialogMaintainArchivedFiles.def
@@ -14,6 +14,8 @@
     Alignment: 'trailing'
     Description: 'Maintain archived files '
     ExcludeFromActiveComponent: true
+    MinimumColumns: 120
+    MinimumRows: 40
     Padding: 'false'
     Title: 'Maintain archived files '
   ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations\04361.def" b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
similarity index 81%
rename from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations\04361.def"
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
index 57e38d0..a84ded0 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations\04361.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListGenerations.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListGenerations id:ListGenerations_61
+Component ListGenerations
 {
-  #keys: '[414996.1.191962761]'
+  #keys: '[414996.1.211223843]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor989
     {
-      #keys: '[414996.1.191962762]'
+      #keys: '[414996.1.211223844]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage963_1
+    #child: listActionBarPage963
     Component DataSetLevel191
     {
-      #keys: '[414996.1.191962764]'
+      #keys: '[414996.1.211223846]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu687_1
+        #child: listContextMenu687
       ]
       Properties:
       [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB\043670.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB\043670.def"
deleted file mode 100644
index 6e22541..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB\043670.def"
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListMQBMLB id:ListMQBMLB_670
-{
-  #keys: '[414996.1.191962779]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor472
-    {
-      #keys: '[414996.1.191962780]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhMQBMLB'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage519_1
-    Component DataSetLevel527
-    {
-      #keys: '[414996.1.191962782]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu319_1
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu319'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def" b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
similarity index 81%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
index f853c10..c692844 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListMQBMLB id:ListMQBMLB_670
+Component ListMQBMLB
 {
-  #keys: '[414996.1.191962679]'
+  #keys: '[414996.1.211223825]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor472
     {
-      #keys: '[414996.1.191962680]'
+      #keys: '[414996.1.211223826]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage519_1
+    #child: listActionBarPage519
     Component DataSetLevel527
     {
-      #keys: '[414996.1.191962682]'
+      #keys: '[414996.1.211223828]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu319_1
+        #child: listContextMenu319
       ]
       Properties:
       [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers\043667.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers\043667.def"
deleted file mode 100644
index 504474f..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers\043667.def"
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListPowers id:ListPowers_667
-{
-  #keys: '[414996.1.191962770]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor671
-    {
-      #keys: '[414996.1.191962771]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhPowers'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage245_1
-    Component DataSetLevel995
-    {
-      #keys: '[414996.1.191962773]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu623_1
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu623'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers\043667.def" b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
similarity index 81%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers\043667.def"
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
index 9063a50..77587f2 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers\043667.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_ListPowers.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListPowers id:ListPowers_667
+Component ListPowers
 {
-  #keys: '[414996.1.192703107]'
+  #keys: '[414996.1.211223834]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor671
     {
-      #keys: '[414996.1.192703108]'
+      #keys: '[414996.1.211223835]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage245_1
+    #child: listActionBarPage245
     Component DataSetLevel995
     {
-      #keys: '[414996.1.192703110]'
+      #keys: '[414996.1.211223837]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu623_1
+        #child: listContextMenu623
       ]
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor\043368.def"
similarity index 85%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
rename to "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor\043368.def"
index 87f6de9..878b981 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_MatrixEditor\043368.def"
@@ -1,19 +1,19 @@
 Quintiq file version 2.0
-Component MatrixEditor
+Component MatrixEditor id:MatrixEditor_368
 {
-  #keys: '[412672.1.78210532]'
+  #keys: '[414996.1.211224081]'
   BaseType: 'WebMatrixEditor'
   Children:
   [
     Component MatrixEditorCell
     {
-      #keys: '[412672.1.78210533]'
+      #keys: '[414996.1.211224082]'
       BaseType: 'WebMatrixEditorCell'
       Children:
       [
         Component DataExtractorCells
         {
-          #keys: '[412672.1.78210534]'
+          #keys: '[414996.1.211224083]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -34,13 +34,13 @@
     }
     Component MatrixEditorRows
     {
-      #keys: '[412672.1.78210535]'
+      #keys: '[414996.1.211224084]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorRows
         {
-          #keys: '[412672.1.78210536]'
+          #keys: '[414996.1.211224085]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -62,13 +62,13 @@
     }
     Component MatrixEditorColumns
     {
-      #keys: '[412672.1.78210537]'
+      #keys: '[414996.1.211224086]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorColumns
         {
-          #keys: '[412672.1.78210538]'
+          #keys: '[414996.1.211224087]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -88,8 +88,8 @@
         Taborder: 2
       ]
     }
-    #child: matrixEditorActionBarPageDemandComparison
-    #child: matrixeditorContextMenuDemandComparison
+    #child: matrixEditorActionBarPageDemandComparison_1
+    #child: matrixeditorContextMenuDemandComparison_1
   ]
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter\043490.def"
similarity index 77%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
copy to "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter\043490.def"
index cd8db6b..6626b06 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter\043490.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component PanelFilter id:PanelFilter_119
+Component PanelFilter id:PanelFilter_490
 {
-  #keys: '[412672.1.61991354]'
+  #keys: '[414996.1.211223981]'
   BaseType: 'WebPanel'
   Children:
   [
     Component ddslGeneration
     {
-      #keys: '[412672.1.61991355]'
+      #keys: '[414996.1.211223982]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -17,7 +17,7 @@
     }
     Component ddslMQBMLB
     {
-      #keys: '[412672.1.61991356]'
+      #keys: '[414996.1.211223983]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -27,7 +27,7 @@
     }
     Component ddslPower
     {
-      #keys: '[412672.1.61991357]'
+      #keys: '[414996.1.211223984]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -37,7 +37,7 @@
     }
     Component dsStartDate
     {
-      #keys: '[412672.1.61991358]'
+      #keys: '[414996.1.211223985]'
       BaseType: 'WebDateSelector'
       Properties:
       [
@@ -47,7 +47,7 @@
     }
     Component dsEndDate
     {
-      #keys: '[412672.1.61991359]'
+      #keys: '[414996.1.211223986]'
       BaseType: 'WebDateSelector'
       Properties:
       [
@@ -56,9 +56,9 @@
         Taborder: 5
       ]
     }
-    Component ButtonFilter
+    Component ButtonFilter676
     {
-      #keys: '[412672.1.61991360]'
+      #keys: '[414996.1.211223987]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -68,7 +68,7 @@
     }
     Component dhStartDate
     {
-      #keys: '[412672.1.61991361]'
+      #keys: '[414996.1.211223988]'
       BaseType: 'WebDataHolder'
       Databinding: 'Date*'
       Properties:
@@ -78,7 +78,7 @@
     }
     Component dhEndDate
     {
-      #keys: '[412672.1.61991362]'
+      #keys: '[414996.1.211223989]'
       BaseType: 'WebDataHolder'
       Databinding: 'Date*'
       Properties:
@@ -88,7 +88,7 @@
     }
     Component ButtonClearFilter
     {
-      #keys: '[414996.1.115030257]'
+      #keys: '[414996.1.211223990]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def
deleted file mode 100644
index 78343ec..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelFilter.def
+++ /dev/null
@@ -1,106 +0,0 @@
-Quintiq file version 2.0
-Component PanelFilter
-{
-  #keys: '[412672.1.78210464]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    Component ddslGeneration
-    {
-      #keys: '[412672.1.78210465]'
-      BaseType: 'WebDropDownStringList'
-      Properties:
-      [
-        Label: 'Generation'
-        Taborder: 0
-      ]
-    }
-    Component ddslMQBMLB
-    {
-      #keys: '[412672.1.78210466]'
-      BaseType: 'WebDropDownStringList'
-      Properties:
-      [
-        Label: 'MQB/MLB'
-        Taborder: 1
-      ]
-    }
-    Component ddslPower
-    {
-      #keys: '[412672.1.78210467]'
-      BaseType: 'WebDropDownStringList'
-      Properties:
-      [
-        Label: '鍔熺巼'
-        Taborder: 2
-      ]
-    }
-    Component dsStartDate
-    {
-      #keys: '[412672.1.78210468]'
-      BaseType: 'WebDateSelector'
-      Properties:
-      [
-        Label: 'Start Date'
-        Taborder: 3
-      ]
-    }
-    Component dsEndDate
-    {
-      #keys: '[412672.1.78210469]'
-      BaseType: 'WebDateSelector'
-      Properties:
-      [
-        Date: 9999-12-31
-        Label: 'End Date'
-        Taborder: 5
-      ]
-    }
-    Component ButtonFilter
-    {
-      #keys: '[412672.1.78210470]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Label: '杩囨护'
-        Taborder: 7
-      ]
-    }
-    Component dhStartDate
-    {
-      #keys: '[412672.1.78210471]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'Date*'
-      Properties:
-      [
-        Taborder: 4
-      ]
-    }
-    Component dhEndDate
-    {
-      #keys: '[412672.1.78210472]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'Date*'
-      Properties:
-      [
-        Taborder: 6
-      ]
-    }
-    Component ButtonClearFilter id:ButtonClearFilter_414
-    {
-      #keys: '[414996.1.137702887]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Label: 'Clear'
-        Taborder: 8
-      ]
-    }
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon\043799.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon\043799.def"
deleted file mode 100644
index 903b349..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon\043799.def"
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-Component PanelRibbon id:PanelRibbon_799
-{
-  #keys: '[412672.1.78210463]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: PanelFilter
-    #child: PanelRibbon504_801
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def" b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504.def
similarity index 82%
rename from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504.def
index d5ad5a9..667bf5f 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504\043801.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelRibbon504.def
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component PanelRibbon504 id:PanelRibbon504_801
+Component PanelRibbon504
 {
-  #keys: '[412672.1.78210473]'
+  #keys: '[414996.1.211223991]'
   BaseType: 'WebPanel'
   Children:
   [
     Component ddlBaseOfflinePlanTable
     {
-      #keys: '[412672.1.78210474]'
+      #keys: '[414996.1.211223992]'
       BaseType: 'WebDropDownList'
       Databinding: 'OfflinePlanTableInfo'
       Children:
       [
         Component DataExtractorRibbon
         {
-          #keys: '[412672.1.78210475]'
+          #keys: '[414996.1.211223993]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -35,7 +35,7 @@
     }
     Component bComparison
     {
-      #keys: '[412672.1.78210476]'
+      #keys: '[414996.1.211223994]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -45,14 +45,14 @@
     }
     Component ddlCompareOfflinePlanTable
     {
-      #keys: '[412672.1.78210579]'
+      #keys: '[414996.1.211223995]'
       BaseType: 'WebDropDownList'
       Databinding: 'OfflinePlanTableInfo'
       Children:
       [
         Component DataExtractorRibbon300
         {
-          #keys: '[412672.1.78210580]'
+          #keys: '[414996.1.211223996]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -73,7 +73,7 @@
     }
     Component bExport
     {
-      #keys: '[414996.1.104721685]'
+      #keys: '[414996.1.211223997]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -83,14 +83,14 @@
     }
     Component dhXMLDataListener
     {
-      #keys: '[414996.1.104721708]'
+      #keys: '[414996.1.211223998]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[ExportXMLManager]*'
       Children:
       [
         Component DataExtractor510
         {
-          #keys: '[414996.1.104721709]'
+          #keys: '[414996.1.211223999]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -107,9 +107,9 @@
         Taborder: 6
       ]
     }
-    Component rbgTimeUnit id:rbgTimeUnit_963
+    Component rbgTimeUnit
     {
-      #keys: '[414996.1.146310444]'
+      #keys: '[414996.1.211224000]'
       BaseType: 'WebRadioButtonGroup'
       Properties:
       [
@@ -120,9 +120,9 @@
         Taborder: 4
       ]
     }
-    Component dhTimeUnit id:dhTimeUnit_384
+    Component dhTimeUnit
     {
-      #keys: '[414996.1.146310475]'
+      #keys: '[414996.1.211224001]'
       BaseType: 'WebDataHolder'
       Databinding: 'String*'
       Properties:
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245\0431.def"
deleted file mode 100644
index 2beb00f..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage245 id:listActionBarPage245_1
-{
-  #keys: '[414996.1.191962772]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
new file mode 100644
index 0000000..70b1750
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage245.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage245
+{
+  #keys: '[414996.1.211223836]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519\0431.def"
deleted file mode 100644
index 9c8196a..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage519 id:listActionBarPage519_1
-{
-  #keys: '[414996.1.191962781]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
new file mode 100644
index 0000000..3ef0486
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage519.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage519
+{
+  #keys: '[414996.1.211223827]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963\0431.def"
deleted file mode 100644
index 17b93f9..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage963 id:listActionBarPage963_1
-{
-  #keys: '[414996.1.191962763]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
new file mode 100644
index 0000000..cbb1e9f
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listActionBarPage963.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage963
+{
+  #keys: '[414996.1.211223845]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319\0431.def"
deleted file mode 100644
index 89a49ad..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu319 id:listContextMenu319_1
-{
-  #keys: '[414996.1.191962783]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
new file mode 100644
index 0000000..ee08f17
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu319.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu319
+{
+  #keys: '[414996.1.211223829]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623\0431.def"
deleted file mode 100644
index 607d7db..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu623 id:listContextMenu623_1
-{
-  #keys: '[414996.1.191962774]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
new file mode 100644
index 0000000..a5988e5
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu623.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu623
+{
+  #keys: '[414996.1.211223838]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687\0431.def"
deleted file mode 100644
index 600931c..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu687 id:listContextMenu687_1
-{
-  #keys: '[414996.1.191962765]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
new file mode 100644
index 0000000..1fceefe
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_listContextMenu687.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu687
+{
+  #keys: '[414996.1.211223847]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixEditorActionBarPageDemandComparison\0431.def"
similarity index 86%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixEditorActionBarPageDemandComparison\0431.def"
index f0083f7..4bd6914 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixEditorActionBarPageDemandComparison\0431.def"
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component matrixEditorActionBarPageDemandComparison id:matrixEditorActionBarPageDemandComparison_1
 {
-  #keys: '[412672.1.61940681]'
+  #keys: '[414996.1.211224088]'
   BaseType: 'matrixEditorActionBarPage'
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixeditorContextMenuDemandComparison\0431.def"
similarity index 85%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison\0431.def"
copy to "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixeditorContextMenuDemandComparison\0431.def"
index 5cd9345..21c8319 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison\0431.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixeditorContextMenuDemandComparison\0431.def"
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component matrixeditorContextMenuDemandComparison id:matrixeditorContextMenuDemandComparison_1
 {
-  #keys: '[412672.1.61940682]'
+  #keys: '[414996.1.211224089]'
   BaseType: 'matrixeditorContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixeditorContextMenuDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixeditorContextMenuDemandComparison.def
deleted file mode 100644
index 15450bc..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixeditorContextMenuDemandComparison.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component matrixeditorContextMenuDemandComparison
-{
-  #keys: '[412672.1.78210540]'
-  BaseType: 'matrixeditorContextMenu'
-  Properties:
-  [
-    Taborder: 4
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def" b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
similarity index 79%
copy from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def"
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
index 397397e..e77fbd3 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pGeneration id:pGeneration_100
+Component pGeneration
 {
-  #keys: '[414996.1.191962760]'
+  #keys: '[414996.1.211223841]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListGenerations_61
     Component dhGenerations
     {
-      #keys: '[414996.1.191962766]'
+      #keys: '[414996.1.211223842]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,16 +15,17 @@
         Taborder: 1
       ]
     }
+    #child: ListGenerations
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.191962767]'
+      #keys: '[414996.1.211223848]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.191962768]'
+          #keys: '[414996.1.211223849]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB\043653.def" b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
similarity index 80%
rename from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB\043653.def"
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
index 7a42124..24dedd8 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB\043653.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMQBMLB.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pMQBMLB id:pMQBMLB_653
+Component pMQBMLB
 {
-  #keys: '[414996.1.191962778]'
+  #keys: '[414996.1.211223823]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListMQBMLB_670
     Component dhMQBMLB
     {
-      #keys: '[414996.1.191962784]'
+      #keys: '[414996.1.211223824]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,16 +15,17 @@
         Taborder: 1
       ]
     }
+    #child: ListMQBMLB
     Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.191962785]'
+      #keys: '[414996.1.211223830]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckMQBMLB
         {
-          #keys: '[414996.1.191962786]'
+          #keys: '[414996.1.211223831]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainLeft\043577.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainLeft\043577.def"
new file mode 100644
index 0000000..e0989a1
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainLeft\043577.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainLeft id:pMainLeft_577
+{
+  #keys: '[414996.1.211223821]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pProductAttributeFilter
+  ]
+  Properties:
+  [
+    FixedSize: true
+    MinimumColumns: 40
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainPanel\04377.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainPanel\04377.def"
new file mode 100644
index 0000000..0eddb56
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainPanel\04377.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainPanel id:pMainPanel_77
+{
+  #keys: '[414996.1.211223783]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMainRight_470
+    #child: pMainLeft_577
+  ]
+  Properties:
+  [
+    Orientation: 'horizontal'
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainRight\043470.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainRight\043470.def"
new file mode 100644
index 0000000..0862a17
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pMainRight\043470.def"
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component pMainRight id:pMainRight_470
+{
+  #keys: '[414996.1.211223784]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pRibbon
+    #child: pOfflinePlanChanges
+  ]
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pOfflinePlanChanges.def
similarity index 82%
copy from _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelDemandComparison.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pOfflinePlanChanges.def
index 3f5965c..528091f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pOfflinePlanChanges.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component PanelDemandComparison
+Component pOfflinePlanChanges
 {
-  #keys: '[412672.1.78210531]'
+  #keys: '[414996.1.211224074]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhTable
     {
-      #keys: '[412672.1.78210541]'
+      #keys: '[414996.1.211224075]'
       BaseType: 'WebDataHolder'
       Databinding: 'LocalTable'
       Properties:
@@ -17,14 +17,14 @@
     }
     Component dhCheckedProducts
     {
-      #keys: '[412672.1.78210542]'
+      #keys: '[414996.1.211224076]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Children:
       [
         Component deCheckedProducts
         {
-          #keys: '[412672.1.78210543]'
+          #keys: '[414996.1.211224077]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -42,7 +42,7 @@
     }
     Component dhFinelProducts
     {
-      #keys: '[412672.1.78210544]'
+      #keys: '[414996.1.211224078]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Properties:
@@ -52,14 +52,14 @@
     }
     Component dhCheckedSalesSegments
     {
-      #keys: '[412672.1.78210545]'
+      #keys: '[414996.1.211224079]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[SalesSegment_MP]*'
       Children:
       [
         Component deCheckedSalesSegments
         {
-          #keys: '[412672.1.78210546]'
+          #keys: '[414996.1.211224080]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -75,17 +75,17 @@
         Taborder: 5
       ]
     }
-    #child: MatrixEditor
+    #child: MatrixEditor_368
     Component dhCheckUnits
     {
-      #keys: '[414996.1.137664350]'
+      #keys: '[414996.1.211224090]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Children:
       [
         Component deCheckUnits
         {
-          #keys: '[414996.1.137664394]'
+          #keys: '[414996.1.211224091]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -103,7 +103,7 @@
     }
     Component dhFinalUnits
     {
-      #keys: '[414996.1.156002469]'
+      #keys: '[414996.1.211224092]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Properties:
@@ -114,6 +114,6 @@
   ]
   Properties:
   [
-    Taborder: 2
+    Taborder: 1
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def" b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
similarity index 80%
rename from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def"
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
index bd0332c..2c3f4da 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pPower id:pPower_969
+Component pPower
 {
-  #keys: '[414996.1.191962769]'
+  #keys: '[414996.1.211223832]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListPowers_667
     Component dhPowers
     {
-      #keys: '[414996.1.191962775]'
+      #keys: '[414996.1.211223833]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,16 +15,17 @@
         Taborder: 1
       ]
     }
+    #child: ListPowers
     Component dhCheckPowers
     {
-      #keys: '[414996.1.191962776]'
+      #keys: '[414996.1.211223839]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckPowers
         {
-          #keys: '[414996.1.191962777]'
+          #keys: '[414996.1.211223840]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter\043697.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter\043697.def"
deleted file mode 100644
index 9ac1ebd..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter\043697.def"
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-Component pProductAttributeFilter id:pProductAttributeFilter_697
-{
-  #keys: '[414996.1.191962759]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: pGeneration_100
-    #child: pPower_969
-    #child: pMQBMLB_653
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
new file mode 100644
index 0000000..22877ae
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pProductAttributeFilter.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component pProductAttributeFilter
+{
+  #keys: '[414996.1.211223822]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMQBMLB
+    #child: pPower
+    #child: pGeneration
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pRibbon.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pRibbon.def
new file mode 100644
index 0000000..041150e
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pRibbon.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pRibbon
+{
+  #keys: '[414996.1.211223980]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: PanelFilter_490
+    #child: PanelRibbon504
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
index 242d357..afdff5a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListGenerations_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListGenerations
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211223757]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
index 242d357..bdc082a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListMQBMLB_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListMQBMLB
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211223765]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
index 242d357..7fcdb2d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_ListPowers_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListPowers
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211223761]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinelProducts_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinelProducts_OnCreated.def
deleted file mode 100644
index 2b1df8e..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinelProducts_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison/dhFinelProducts
-Response OnCreated () id:Response_PanelDemandComparison_dhFinelProducts_OnCreated
-{
-  #keys: '[412672.1.78210526]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( DataHolderProduct.Data().Copy() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhTable_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhTable_OnDataChanged.def
deleted file mode 100644
index 35546db..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhTable_OnDataChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison/dhTable
-Response OnDataChanged () id:Response_PanelDemandComparison_dhTable_OnDataChanged
-{
-  #keys: '[412672.1.78210528]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      PanelDemandComparison.Title( this.Data().Name() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonClearFilter_OnClick.def
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonClearFilter_OnClick.def
index a93ecd4..fc961bd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonClearFilter_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ButtonClearFilter
-Response OnClick () id:Response_PanelFilter_119_ButtonClearFilter_OnClick
+#parent: PanelFilter_490/ButtonClearFilter
+Response OnClick () id:Response_PanelFilter_490_ButtonClearFilter_OnClick
 {
-  #keys: '[414996.1.115030293]'
+  #keys: '[414996.1.211223971]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonFilter676_OnClick.def
similarity index 82%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonFilter676_OnClick.def
index 01398db..5bd05c4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ButtonFilter676_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ButtonFilter
-Response OnClick () id:Response_PanelFilter_119_ButtonFilter_OnClick
+#parent: PanelFilter_490/ButtonFilter676
+Response OnClick () id:Response_PanelFilter_490_ButtonFilter676_OnClick
 {
-  #keys: '[412672.1.61991348]'
+  #keys: '[414996.1.211223974]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslGeneration_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslGeneration_OnCreated.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslGeneration_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslGeneration_OnCreated.def
index d7286fc..a264f00 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslGeneration_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslGeneration_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ddslGeneration
-Response OnCreated () id:Response_PanelFilter_119_ddslGeneration_OnCreated
+#parent: PanelFilter_490/ddslGeneration
+Response OnCreated () id:Response_PanelFilter_490_ddslGeneration_OnCreated
 {
-  #keys: '[412672.1.61991353]'
+  #keys: '[414996.1.211223979]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslMQBMLB_OnCreated.def
similarity index 74%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslMQBMLB_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslMQBMLB_OnCreated.def
index 3228a00..0a81a7d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslMQBMLB_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ddslMQBMLB
-Response OnCreated () id:Response_PanelFilter_119_ddslMQBMLB_OnCreated
+#parent: PanelFilter_490/ddslMQBMLB
+Response OnCreated () id:Response_PanelFilter_490_ddslMQBMLB_OnCreated
 {
-  #keys: '[412672.1.61991352]'
+  #keys: '[414996.1.211223978]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslPower_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslPower_OnCreated.def
similarity index 74%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslPower_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslPower_OnCreated.def
index 7d8370b..aac10bd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslPower_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_ddslPower_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ddslPower
-Response OnCreated () id:Response_PanelFilter_119_ddslPower_OnCreated
+#parent: PanelFilter_490/ddslPower
+Response OnCreated () id:Response_PanelFilter_490_ddslPower_OnCreated
 {
-  #keys: '[412672.1.61991351]'
+  #keys: '[414996.1.211223977]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhEndDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhEndDate_OnCreated.def
similarity index 62%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhEndDate_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhEndDate_OnCreated.def
index 2aedb4a..7790a56 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhEndDate_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhEndDate_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dhEndDate
-Response OnCreated () id:Response_PanelFilter_119_dhEndDate_OnCreated
+#parent: PanelFilter_490/dhEndDate
+Response OnCreated () id:Response_PanelFilter_490_dhEndDate_OnCreated
 {
-  #keys: '[412672.1.61991346]'
+  #keys: '[414996.1.211223972]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhStartDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhStartDate_OnCreated.def
similarity index 62%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhStartDate_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhStartDate_OnCreated.def
index a2dc135..7176887 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhStartDate_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dhStartDate_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dhStartDate
-Response OnCreated () id:Response_PanelFilter_119_dhStartDate_OnCreated
+#parent: PanelFilter_490/dhStartDate
+Response OnCreated () id:Response_PanelFilter_490_dhStartDate_OnCreated
 {
-  #keys: '[412672.1.61991347]'
+  #keys: '[414996.1.211223973]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsEndDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsEndDate_OnChanged.def
similarity index 63%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsEndDate_OnChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsEndDate_OnChanged.def
index 79ee881..b8bc3b6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsEndDate_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsEndDate_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dsEndDate
-Response OnChanged () id:Response_PanelFilter_119_dsEndDate_OnChanged
+#parent: PanelFilter_490/dsEndDate
+Response OnChanged () id:Response_PanelFilter_490_dsEndDate_OnChanged
 {
-  #keys: '[412672.1.61991349]'
+  #keys: '[414996.1.211223975]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsStartDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsStartDate_OnChanged.def
similarity index 63%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsStartDate_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsStartDate_OnChanged.def
index 1b7e133..95ab8bc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsStartDate_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_490_dsStartDate_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dsStartDate
-Response OnChanged () id:Response_PanelFilter_119_dsStartDate_OnChanged
+#parent: PanelFilter_490/dsStartDate
+Response OnChanged () id:Response_PanelFilter_490_dsStartDate_OnChanged
 {
-  #keys: '[412672.1.61991350]'
+  #keys: '[414996.1.211223976]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ButtonClearFilter_OnClick\043466.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ButtonClearFilter_OnClick\043466.def"
deleted file mode 100644
index 11eae19..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ButtonClearFilter_OnClick\043466.def"
+++ /dev/null
@@ -1,19 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/ButtonClearFilter_414
-Response OnClick () id:Response_PanelFilter_119_ButtonClearFilter_OnClick_466
-{
-  #keys: '[414996.1.137702886]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  QuillAction
-  {
-    Body:
-    [*
-      ddslGeneration.Text( "<All>" );
-      ddslMQBMLB.Text( "<All>" );
-      ddslPower.Text( "<All>" )
-      dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
-    *]
-    GroupServerCalls: false
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ButtonFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ButtonFilter_OnClick.def
deleted file mode 100644
index 42874bf..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ButtonFilter_OnClick.def
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/ButtonFilter
-Response OnClick () id:Response_PanelFilter_ButtonFilter_OnClick
-{
-  #keys: '[412672.1.78210457]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      products := dhFinelProducts.Data().Copy();
-      if( ddslGeneration.Text() <> "<All>" ){
-        products := selectset( products,Elements,element,element.Generation() = ddslGeneration.Text());
-      }
-      if( ddslMQBMLB.Text() <> "<All>" ){
-        products := selectset( products,Elements,element,element.MQBMLB() = ddslMQBMLB.Text());
-      }
-      if( ddslPower.Text() <> "<All>" ){
-        products := selectset( products,Elements,element,element.Power() = ddslPower.Text());
-      }
-      dhFinelProducts.Data( &products );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dhStartDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dhStartDate_OnCreated.def
deleted file mode 100644
index 995c89d..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dhStartDate_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/dhStartDate
-Response OnCreated () id:Response_PanelFilter_dhStartDate_OnCreated
-{
-  #keys: '[412672.1.78210456]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( Date::MinDate() );
-    *]
-  }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhTimeUnit_OnCreated\043478.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhTimeUnit_OnCreated\043478.def"
deleted file mode 100644
index 45a6482..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhTimeUnit_OnCreated\043478.def"
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon504_801/dhTimeUnit_384
-Response OnCreated () id:Response_PanelRibbon322_dhTimeUnit_OnCreated_478
-{
-  #keys: '[414996.1.146310473]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( "Day" );
-    *]
-  }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhXMLDataListener_OnDataChanged\043648.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhXMLDataListener_OnDataChanged\043648.def"
deleted file mode 100644
index 1bcf365..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_dhXMLDataListener_OnDataChanged\043648.def"
+++ /dev/null
@@ -1,22 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon504_801/dhXMLDataListener
-Response OnDataChanged () id:Response_PanelRibbon504_dhXMLDataListener_OnDataChanged_648
-{
-  #keys: '[414996.1.104721706]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  QuillAction
-  {
-    Body:
-    [*
-      traverse( dhXMLDataListener.Data(),Elements,element ){
-        binaryValue := element.Export();
-      
-        Application.Download( element.Name() + "_" + DateTime::Now().Format( "YM2D2H2mmss" ) + ".xlsx", binaryValue.AsBinaryData() );
-      
-        element.Delete();
-      }
-    *]
-    GroupServerCalls: false
-  }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_rbgTimeUnit_OnUserChanged\043273.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_rbgTimeUnit_OnUserChanged\043273.def"
deleted file mode 100644
index f0f31fd..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_rbgTimeUnit_OnUserChanged\043273.def"
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelRibbon504_801/rbgTimeUnit_963
-Response OnUserChanged () id:Response_PanelRibbon322_rbgTimeUnit_OnUserChanged_273
-{
-  #keys: '[414996.1.146310443]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebRadioButtonGroup_OnUserChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      dhTimeUnit.Data( this.BoundValue() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bComparison_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bComparison_OnClick.def
similarity index 86%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bComparison_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bComparison_OnClick.def
index f398e76..6260e62 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bComparison_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bComparison_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon504_801/bComparison
-Response OnClick () id:Response_PanelRibbon504_801_bComparison_OnClick
+#parent: PanelRibbon504/bComparison
+Response OnClick () id:Response_PanelRibbon504_bComparison_OnClick
 {
-  #keys: '[412672.1.78210454]'
+  #keys: '[414996.1.211223970]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bExport_OnClick.def
similarity index 88%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bExport_OnClick.def
index 7749bd6..4431779 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_801_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_bExport_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon504_801/bExport
+#parent: PanelRibbon504/bExport
 Response OnClick () id:Response_PanelRibbon504_bExport_OnClick
 {
-  #keys: '[414996.1.104721684]'
+  #keys: '[414996.1.211223969]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhTimeUnit_OnCreated.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhTimeUnit_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhTimeUnit_OnCreated.def
index 8407403..5af1092 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhTimeUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhTimeUnit_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
 #parent: PanelRibbon504/dhTimeUnit
-Response OnCreated () id:Response_PanelRibbon504_801_dhTimeUnit_OnCreated
+Response OnCreated () id:Response_PanelRibbon504_dhTimeUnit_OnCreated
 {
-  #keys: '[414996.1.147730601]'
+  #keys: '[414996.1.211223966]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def
similarity index 87%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def
index 3bcabcb..e0cbf71 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon504/dhXMLDataListener_273
+#parent: PanelRibbon504/dhXMLDataListener
 Response OnDataChanged () id:Response_PanelRibbon504_dhXMLDataListener_OnDataChanged
 {
-  #keys: '[414996.1.106110528]'
+  #keys: '[414996.1.211223968]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_rbgTimeUnit_OnUserChanged.def
similarity index 65%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_rbgTimeUnit_OnUserChanged.def
index 2ce7f7e..cba0ac4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelRibbon504_rbgTimeUnit_OnUserChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon763/rbgTimeUnit
-Response OnUserChanged () id:Response_PanelRibbon510_rbgTimeUnit_OnUserChanged
+#parent: PanelRibbon504/rbgTimeUnit
+Response OnUserChanged () id:Response_PanelRibbon504_rbgTimeUnit_OnUserChanged
 {
-  #keys: '[414996.1.158400569]'
+  #keys: '[414996.1.211223967]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebRadioButtonGroup_OnUserChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
deleted file mode 100644
index c4a8009..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-#parent: pGeneration_100/dhCheckGenerations
-Response OnDataChanged () id:Response_pGeneration_100_dhCheckGenerations_OnDataChanged
-{
-  #keys: '[414996.1.191962753]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      products := dhFinelProducts.Data();
-      if( this.Data().Size() <> 0 ){
-        products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Generation()));
-        dhFinelProducts.Data( &products );
-      }else{
-        if( dhCheckedProducts.Data().Size() <> 0 ){
-          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
-        }else{
-          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
-        }
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index 416291b..f778de5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration_100/dhCheckGenerations
-Response OnDataChanged () id:Response_pGeneration_100_dhCheckGenerations_OnDataChanged
+#parent: pGeneration/dhCheckGenerations
+Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.192703090]'
+  #keys: '[414996.1.211223756]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_100_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_100_dhGenerations_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
index 1412078..e5d83d8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_100_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pGeneration_dhGenerations_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration_100/dhGenerations
-Response OnCreated () id:Response_pGeneration_100_dhGenerations_OnCreated
+#parent: pGeneration/dhGenerations
+Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.191962754]'
+  #keys: '[414996.1.211223759]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
deleted file mode 100644
index 64154ea..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-#parent: pMQBMLB_653/dhCheckMQBMLB
-Response OnDataChanged () id:Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged
-{
-  #keys: '[414996.1.191962747]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      products := dhFinelProducts.Data();
-      if( this.Data().Size() <> 0 ){
-        products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.MQBMLB()));
-        dhFinelProducts.Data( &products );
-      }else{
-        if( dhCheckedProducts.Data().Size() <> 0 ){ 
-          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
-        }else{
-          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
-        }
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
similarity index 81%
copy from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 0aaeb78..e1d7af4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB_653/dhCheckMQBMLB
-Response OnDataChanged () id:Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged
+#parent: pMQBMLB/dhCheckMQBMLB
+Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.192703084]'
+  #keys: '[414996.1.211223764]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
similarity index 70%
copy from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index b2eeb42..245b2e1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB_653/dhMQBMLB
-Response OnCreated () id:Response_pMQBMLB_653_dhMQBMLB_OnCreated
+#parent: pMQBMLB/dhMQBMLB
+Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.191962748]'
+  #keys: '[414996.1.211223767]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckUnits_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckUnits_OnDataChanged.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckUnits_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckUnits_OnDataChanged.def
index ccb29d2..4a06e14 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckUnits_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckUnits_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhCheckUnits
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckUnits_OnDataChanged
+#parent: pOfflinePlanChanges/dhCheckUnits
+Response OnDataChanged () id:Response_pOfflinePlanChanges_dhCheckUnits_OnDataChanged
 {
-  #keys: '[414996.1.137664549]'
+  #keys: '[414996.1.211224067]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedProducts_OnDataChanged.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedProducts_OnDataChanged.def
index 9246aad..7eba808 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedProducts_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhCheckedProducts
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged
+#parent: pOfflinePlanChanges/dhCheckedProducts
+Response OnDataChanged () id:Response_pOfflinePlanChanges_dhCheckedProducts_OnDataChanged
 {
-  #keys: '[412672.1.78210527]'
+  #keys: '[414996.1.211224072]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedSalesSegments_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedSalesSegments_OnDataChanged.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedSalesSegments_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedSalesSegments_OnDataChanged.def
index 569f8fb..77629fa 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedSalesSegments_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhCheckedSalesSegments_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhCheckedSalesSegments
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckedSalesSegments_OnDataChanged
+#parent: pOfflinePlanChanges/dhCheckedSalesSegments
+Response OnDataChanged () id:Response_pOfflinePlanChanges_dhCheckedSalesSegments_OnDataChanged
 {
-  #keys: '[412672.1.78210525]'
+  #keys: '[414996.1.211224070]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinalUnits_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinalUnits_OnCreated.def
similarity index 60%
copy from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinalUnits_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinalUnits_OnCreated.def
index 7775cdb..40e35e6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinalUnits_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinalUnits_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhFinalUnits
-Response OnCreated () id:Response_PanelDemandComparison_dhFinalUnits_OnCreated
+#parent: pOfflinePlanChanges/dhFinalUnits
+Response OnCreated () id:Response_pOfflinePlanChanges_dhFinalUnits_OnCreated
 {
-  #keys: '[414996.1.156002689]'
+  #keys: '[414996.1.211224066]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinelProducts_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinelProducts_OnCreated.def
new file mode 100644
index 0000000..e5bcd19
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhFinelProducts_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pOfflinePlanChanges/dhFinelProducts
+Response OnCreated () id:Response_pOfflinePlanChanges_dhFinelProducts_OnCreated
+{
+  #keys: '[414996.1.211224071]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Data( DataHolderProduct.Data().Copy() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhTable_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhTable_OnDataChanged.def
new file mode 100644
index 0000000..2fb4357
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pOfflinePlanChanges_dhTable_OnDataChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pOfflinePlanChanges/dhTable
+Response OnDataChanged () id:Response_pOfflinePlanChanges_dhTable_OnDataChanged
+{
+  #keys: '[414996.1.211224073]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pOfflinePlanChanges.Title( this.Data().Name() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_969_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_969_dhCheckPowers_OnDataChanged.def
deleted file mode 100644
index 116d183..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_969_dhCheckPowers_OnDataChanged.def
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-#parent: pPower_969/dhCheckPowers
-Response OnDataChanged () id:Response_pPower_969_dhCheckPowers_OnDataChanged
-{
-  #keys: '[414996.1.191962750]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      products := dhFinelProducts.Data();
-      if( this.Data().Size() <> 0 ){
-        products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Power()));
-        dhFinelProducts.Data( &products );
-      }else{
-        if( dhCheckedProducts.Data().Size() <> 0 ){
-          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
-        }else{
-          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
-        }
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
index c8fa6c5..13beb0b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower_969/dhCheckPowers
-Response OnDataChanged () id:Response_pPower_969_dhCheckPowers_OnDataChanged
+#parent: pPower/dhCheckPowers
+Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.192703087]'
+  #keys: '[414996.1.211223760]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_969_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_969_dhPowers_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
index 17a933a..f1a40cd 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_969_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pPower_dhPowers_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower_969/dhPowers
-Response OnCreated () id:Response_pPower_969_dhPowers_OnCreated
+#parent: pPower/dhPowers
+Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.191962751]'
+  #keys: '[414996.1.211223763]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/_ROOT_Component_FormOfflinePlanChanges\043701.def" "b/_Main/UI/MacroPlannerWebApp/Component_Form701/_ROOT_Component_FormOfflinePlanChanges\043701.def"
index 1165a2d..24911a6 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/_ROOT_Component_FormOfflinePlanChanges\043701.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_Form701/_ROOT_Component_FormOfflinePlanChanges\043701.def"
@@ -7,9 +7,7 @@
   BaseType: 'WebForm'
   Children:
   [
-    #child: PanelRibbon_799
-    #child: PanelDemandComparison
-    #child: pProductAttributeFilter_697
+    #child: pMainPanel_77
   ]
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan\043439.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pAnnualPlanReport\043439.def"
similarity index 97%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan\043439.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pAnnualPlanReport\043439.def"
index 3eca22c..99c3ce0 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_PanelAnnualPlan\043439.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pAnnualPlanReport\043439.def"
@@ -1,5 +1,5 @@
 Quintiq file version 2.0
-Component PanelAnnualPlan id:PanelAnnualPlan_439
+Component pAnnualPlanReport id:pAnnualPlanReport_439
 {
   #keys: '[414996.1.209190957]'
   BaseType: 'WebPanel'
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def
index e271a45..df77564 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Component_pMainRight.def
@@ -6,7 +6,7 @@
   Children:
   [
     #child: pRibbon
-    #child: PanelAnnualPlan_439
+    #child: pAnnualPlanReport_439
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged.def
deleted file mode 100644
index fa698b0..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelAnnualPlan_439/dhComparisonData
-Response OnDataChanged () id:Response_PanelAnnualPlan_439_dhComparisonData_OnDataChanged
-{
-  #keys: '[414996.1.209190954]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      PanelAnnualPlan.Title( this.Data().Name() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedEntitys_OnDataChanged.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedEntitys_OnDataChanged.def
index 149586c..08b7eea 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedEntitys_OnDataChanged.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: PanelAnnualPlan_439/dhCheckedEntitys
-Response OnDataChanged () id:Response_PanelAnnualPlan_439_dhCheckedEntitys_OnDataChanged
+#parent: pAnnualPlanReport_439/dhCheckedEntitys
+Response OnDataChanged () id:Response_pAnnualPlanReport_439_dhCheckedEntitys_OnDataChanged
 {
   #keys: '[414996.1.209190951]'
   CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedProduct_OnDataChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedProduct_OnDataChanged.def
index 06a8fb6..1971b8e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhCheckedProduct_OnDataChanged.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: PanelAnnualPlan_439/dhCheckedProduct
-Response OnDataChanged () id:Response_PanelAnnualPlan_439_dhCheckedProduct_OnDataChanged
+#parent: pAnnualPlanReport_439/dhCheckedProduct
+Response OnDataChanged () id:Response_pAnnualPlanReport_439_dhCheckedProduct_OnDataChanged
 {
   #keys: '[414996.1.209190956]'
   CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhComparisonData_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhComparisonData_OnDataChanged.def
new file mode 100644
index 0000000..e4c4d51
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhComparisonData_OnDataChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pAnnualPlanReport_439/dhComparisonData
+Response OnDataChanged () id:Response_pAnnualPlanReport_439_dhComparisonData_OnDataChanged
+{
+  #keys: '[414996.1.209190954]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pAnnualPlanReport.Title( this.Data().Name() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelEntitys_OnCreated.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelEntitys_OnCreated.def
index a87ceab..7d18a57 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelEntitys_OnCreated.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: PanelAnnualPlan_439/dhFinelEntitys
-Response OnCreated () id:Response_PanelAnnualPlan_439_dhFinelEntitys_OnCreated
+#parent: pAnnualPlanReport_439/dhFinelEntitys
+Response OnCreated () id:Response_pAnnualPlanReport_439_dhFinelEntitys_OnCreated
 {
   #keys: '[414996.1.209190950]'
   CanBindMultiple: false
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelProduct_OnCreated.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelProduct_OnCreated.def
index 93d8df5..a15092d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormAnnualPlanReport/Response_pAnnualPlanReport_439_dhFinelProduct_OnCreated.def
@@ -1,6 +1,6 @@
 Quintiq file version 2.0
-#parent: PanelAnnualPlan_439/dhFinelProduct
-Response OnCreated () id:Response_PanelAnnualPlan_439_dhFinelProduct_OnCreated
+#parent: pAnnualPlanReport_439/dhFinelProduct
+Response OnCreated () id:Response_pAnnualPlanReport_439_dhFinelProduct_OnCreated
 {
   #keys: '[414996.1.209190955]'
   CanBindMultiple: false
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations\04361.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
similarity index 81%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations\04361.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
index b84571f..6673770 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations\04361.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListGenerations.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListGenerations id:ListGenerations_61
+Component ListGenerations
 {
-  #keys: '[414996.1.192703098]'
+  #keys: '[414996.1.211223084]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor989
     {
-      #keys: '[414996.1.192703099]'
+      #keys: '[414996.1.211223085]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage963_1
+    #child: listActionBarPage963
     Component DataSetLevel191
     {
-      #keys: '[414996.1.192703101]'
+      #keys: '[414996.1.211223087]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu687_1
+        #child: listContextMenu687
       ]
       Properties:
       [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB\043670.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB\043670.def"
deleted file mode 100644
index 54e70ea..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB\043670.def"
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListMQBMLB id:ListMQBMLB_670
-{
-  #keys: '[414996.1.192703116]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor472
-    {
-      #keys: '[414996.1.192703117]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhMQBMLB'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage519_1
-    Component DataSetLevel527
-    {
-      #keys: '[414996.1.192703119]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu319_1
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu319'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
similarity index 81%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
index f853c10..493bb13 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListMQBMLB.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListMQBMLB id:ListMQBMLB_670
+Component ListMQBMLB
 {
-  #keys: '[414996.1.191962679]'
+  #keys: '[414996.1.211223066]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor472
     {
-      #keys: '[414996.1.191962680]'
+      #keys: '[414996.1.211223067]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage519_1
+    #child: listActionBarPage519
     Component DataSetLevel527
     {
-      #keys: '[414996.1.191962682]'
+      #keys: '[414996.1.211223069]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu319_1
+        #child: listContextMenu319
       ]
       Properties:
       [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers\043667.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
similarity index 81%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers\043667.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
index 9063a50..cf62e07 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers\043667.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_ListPowers.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component ListPowers id:ListPowers_667
+Component ListPowers
 {
-  #keys: '[414996.1.192703107]'
+  #keys: '[414996.1.211223075]'
   BaseType: 'WebList'
   Children:
   [
     Component DataExtractor671
     {
-      #keys: '[414996.1.192703108]'
+      #keys: '[414996.1.211223076]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
@@ -17,14 +17,14 @@
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage245_1
+    #child: listActionBarPage245
     Component DataSetLevel995
     {
-      #keys: '[414996.1.192703110]'
+      #keys: '[414996.1.211223078]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu623_1
+        #child: listContextMenu623
       ]
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor\043298.def"
similarity index 84%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor\043298.def"
index 7e1f2d0..3ae066c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_MatrixEditor\043298.def"
@@ -1,19 +1,19 @@
 Quintiq file version 2.0
-Component MatrixEditor
+Component MatrixEditor id:MatrixEditor_298
 {
-  #keys: '[412672.0.1085881196]'
+  #keys: '[414996.1.211223489]'
   BaseType: 'WebMatrixEditor'
   Children:
   [
     Component MatrixEditorCell
     {
-      #keys: '[412672.0.1085881197]'
+      #keys: '[414996.1.211223490]'
       BaseType: 'WebMatrixEditorCell'
       Children:
       [
         Component DataExtractorCells
         {
-          #keys: '[412672.0.1085881198]'
+          #keys: '[414996.1.211223491]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -34,13 +34,13 @@
     }
     Component MatrixEditorRows
     {
-      #keys: '[412672.0.1085881201]'
+      #keys: '[414996.1.211223492]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorRows
         {
-          #keys: '[412672.0.1085881202]'
+          #keys: '[414996.1.211223493]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -62,13 +62,13 @@
     }
     Component MatrixEditorColumns
     {
-      #keys: '[412672.0.1085881205]'
+      #keys: '[414996.1.211223494]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorColumns
         {
-          #keys: '[412672.0.1085881206]'
+          #keys: '[414996.1.211223495]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -88,8 +88,8 @@
         Taborder: 2
       ]
     }
-    #child: matrixEditorActionBarPageDemandComparison
-    #child: matrixeditorContextMenuDemandComparison
+    #child: matrixEditorActionBarPageDemandComparison_1
+    #child: matrixeditorContextMenuDemandComparison_1
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def
deleted file mode 100644
index 07a6ec9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison294.def
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-Component PanelDemandComparison294
-{
-  #keys: '[412672.0.1111643045]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: PanelSelection
-    #child: PanelOperation_568
-    #child: PanelFilter
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter\043137.def"
similarity index 76%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
copy to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter\043137.def"
index cd8db6b..1af6873 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter\043137.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component PanelFilter id:PanelFilter_119
+Component PanelFilter id:PanelFilter_137
 {
-  #keys: '[412672.1.61991354]'
+  #keys: '[414996.1.211223420]'
   BaseType: 'WebPanel'
   Children:
   [
     Component ddslGeneration
     {
-      #keys: '[412672.1.61991355]'
+      #keys: '[414996.1.211223421]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -17,7 +17,7 @@
     }
     Component ddslMQBMLB
     {
-      #keys: '[412672.1.61991356]'
+      #keys: '[414996.1.211223422]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -27,7 +27,7 @@
     }
     Component ddslPower
     {
-      #keys: '[412672.1.61991357]'
+      #keys: '[414996.1.211223423]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -37,7 +37,7 @@
     }
     Component dsStartDate
     {
-      #keys: '[412672.1.61991358]'
+      #keys: '[414996.1.211223424]'
       BaseType: 'WebDateSelector'
       Properties:
       [
@@ -47,7 +47,7 @@
     }
     Component dsEndDate
     {
-      #keys: '[412672.1.61991359]'
+      #keys: '[414996.1.211223425]'
       BaseType: 'WebDateSelector'
       Properties:
       [
@@ -56,9 +56,9 @@
         Taborder: 5
       ]
     }
-    Component ButtonFilter
+    Component ButtonFilter485
     {
-      #keys: '[412672.1.61991360]'
+      #keys: '[414996.1.211223426]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -68,7 +68,7 @@
     }
     Component dhStartDate
     {
-      #keys: '[412672.1.61991361]'
+      #keys: '[414996.1.211223427]'
       BaseType: 'WebDataHolder'
       Databinding: 'Date*'
       Properties:
@@ -78,7 +78,7 @@
     }
     Component dhEndDate
     {
-      #keys: '[412672.1.61991362]'
+      #keys: '[414996.1.211223428]'
       BaseType: 'WebDataHolder'
       Databinding: 'Date*'
       Properties:
@@ -88,7 +88,7 @@
     }
     Component ButtonClearFilter
     {
-      #keys: '[414996.1.115030257]'
+      #keys: '[414996.1.211223429]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -102,5 +102,6 @@
     FixedSize: true
     Orientation: 'horizontal'
     Taborder: 1
+    Visible: false
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def
deleted file mode 100644
index ec8b141..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelFilter.def
+++ /dev/null
@@ -1,106 +0,0 @@
-Quintiq file version 2.0
-Component PanelFilter
-{
-  #keys: '[412672.0.1119852113]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    Component ddslGeneration
-    {
-      #keys: '[412672.0.1119852174]'
-      BaseType: 'WebDropDownStringList'
-      Properties:
-      [
-        Label: 'Generation'
-        Taborder: 0
-      ]
-    }
-    Component ddslMQBMLB
-    {
-      #keys: '[412672.0.1119852186]'
-      BaseType: 'WebDropDownStringList'
-      Properties:
-      [
-        Label: 'MQB/MLB'
-        Taborder: 1
-      ]
-    }
-    Component ddslPower
-    {
-      #keys: '[412672.0.1119852198]'
-      BaseType: 'WebDropDownStringList'
-      Properties:
-      [
-        Label: '鍔熺巼'
-        Taborder: 2
-      ]
-    }
-    Component dsStartDate
-    {
-      #keys: '[412672.0.1119852248]'
-      BaseType: 'WebDateSelector'
-      Properties:
-      [
-        Label: 'Start Date'
-        Taborder: 3
-      ]
-    }
-    Component dsEndDate
-    {
-      #keys: '[412672.0.1119852261]'
-      BaseType: 'WebDateSelector'
-      Properties:
-      [
-        Date: 9999-12-31
-        Label: 'End Date'
-        Taborder: 5
-      ]
-    }
-    Component ButtonFilter
-    {
-      #keys: '[412672.0.1121729150]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Label: '杩囨护'
-        Taborder: 7
-      ]
-    }
-    Component dhStartDate
-    {
-      #keys: '[412672.0.1122339350]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'Date*'
-      Properties:
-      [
-        Taborder: 4
-      ]
-    }
-    Component dhEndDate
-    {
-      #keys: '[412672.0.1122339363]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'Date*'
-      Properties:
-      [
-        Taborder: 6
-      ]
-    }
-    Component ButtonClearFilter id:ButtonClearFilter_474
-    {
-      #keys: '[414996.1.116558838]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Label: 'Clear'
-        Taborder: 8
-      ]
-    }
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def"
deleted file mode 100644
index b87d778..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation\043568.def"
+++ /dev/null
@@ -1,73 +0,0 @@
-Quintiq file version 2.0
-Component PanelOperation id:PanelOperation_568
-{
-  #keys: '[412672.0.1111643154]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    Component ButtonCompare
-    {
-      #keys: '[412672.0.1111643161]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Label: '寮�濮嬪姣�'
-        Taborder: 3
-      ]
-    }
-    Component dhXMLDataListener id:dhXMLDataListener_906
-    {
-      #keys: '[412672.0.1109203483]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'ExportXMLManager'
-      Children:
-      [
-        Component DataExtractor510 id:DataExtractor510_532
-        {
-          #keys: '[412672.0.1109203484]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'RecycleBin'
-            FixedFilter: 'object.Name() = LocalCell_DemandComparison::GetTableName()'
-            Source: 'RecycleBin'
-            Taborder: 0
-            Transformation: 'ExportXMLManager'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-    Component bExport id:bExport_98
-    {
-      #keys: '[412672.0.1109203510]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Image: 'EXPORT1'
-        Label: '瀵煎嚭'
-        Taborder: 1
-      ]
-    }
-    #child: pVersionInfomation
-    Component bMaintainArchivedFiles
-    {
-      #keys: '[414996.1.144423972]'
-      BaseType: 'WebButton'
-      Properties:
-      [
-        Image: 'MAGAZINE_FOLDER'
-        Label: 'M'
-        Taborder: 0
-      ]
-    }
-  ]
-  Properties:
-  [
-    Orientation: 'horizontal'
-    Taborder: 2
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation.def
new file mode 100644
index 0000000..7bfb53b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelOperation.def
@@ -0,0 +1,62 @@
+Quintiq file version 2.0
+Component PanelOperation
+{
+  #keys: '[414996.1.211223409]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    Component ButtonCompare
+    {
+      #keys: '[414996.1.211223410]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Label: '寮�濮嬪姣�'
+        Taborder: 2
+      ]
+    }
+    Component dhXMLDataListener
+    {
+      #keys: '[414996.1.211223411]'
+      BaseType: 'WebDataHolder'
+      Databinding: 'ExportXMLManager'
+      Children:
+      [
+        Component DataExtractor510
+        {
+          #keys: '[414996.1.211223412]'
+          BaseType: 'WebDataExtractor'
+          Properties:
+          [
+            DataType: 'RecycleBin'
+            FixedFilter: 'object.Name() = LocalCell_DemandComparison::GetTableName()'
+            Source: 'RecycleBin'
+            Taborder: 0
+            Transformation: 'ExportXMLManager'
+          ]
+        }
+      ]
+      Properties:
+      [
+        Taborder: 1
+      ]
+    }
+    Component bExport
+    {
+      #keys: '[414996.1.211223413]'
+      BaseType: 'WebButton'
+      Properties:
+      [
+        Image: 'EXPORT1'
+        Label: '瀵煎嚭'
+        Taborder: 0
+      ]
+    }
+    #child: pVersionInfomation_411
+  ]
+  Properties:
+  [
+    Orientation: 'horizontal'
+    Taborder: 2
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection\043985.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection\043985.def"
new file mode 100644
index 0000000..6bbe475
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection\043985.def"
@@ -0,0 +1,21 @@
+Quintiq file version 2.0
+Component PanelSelection id:PanelSelection_985
+{
+  #keys: '[414996.1.211223359]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pSelectionPR_478
+    #child: pSelectionBudget_753
+    #child: pSelectionPPA_497
+    #child: pSelectionIDS_5
+    #child: pSelectionCurve_639
+    #child: pSelectionPP_270
+    #child: PanelSelectionChecks_369
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def
deleted file mode 100644
index 51b4cfe..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelection.def
+++ /dev/null
@@ -1,21 +0,0 @@
-Quintiq file version 2.0
-Component PanelSelection
-{
-  #keys: '[412672.0.1111643222]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: pSelectionPR
-    #child: pSelectionBudget
-    #child: pSelectionPPA
-    #child: pSelectionIDS
-    #child: pSelectionCurve
-    #child: pSelectionPP
-    #child: PanelSelectionChecks
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks\043369.def"
similarity index 77%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks\043369.def"
index b5a1f1d..4ef7427 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelSelectionChecks\043369.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component PanelSelectionChecks
+Component PanelSelectionChecks id:PanelSelectionChecks_369
 {
-  #keys: '[412672.0.1111602504]'
+  #keys: '[414996.1.211223402]'
   BaseType: 'WebPanel'
   Children:
   [
     Component CheckboxPR
     {
-      #keys: '[412672.0.1112207508]'
+      #keys: '[414996.1.211223403]'
       BaseType: 'WebCheckbox'
       Properties:
       [
@@ -18,7 +18,7 @@
     }
     Component CheckboxPP
     {
-      #keys: '[412672.0.1112392614]'
+      #keys: '[414996.1.211223404]'
       BaseType: 'WebCheckbox'
       Properties:
       [
@@ -28,7 +28,7 @@
     }
     Component CheckboxBudget
     {
-      #keys: '[412672.0.1112392620]'
+      #keys: '[414996.1.211223405]'
       BaseType: 'WebCheckbox'
       Properties:
       [
@@ -38,7 +38,7 @@
     }
     Component CheckboxPPA
     {
-      #keys: '[412672.0.1112392625]'
+      #keys: '[414996.1.211223406]'
       BaseType: 'WebCheckbox'
       Properties:
       [
@@ -48,7 +48,7 @@
     }
     Component CheckboxIDS
     {
-      #keys: '[412672.0.1109206606]'
+      #keys: '[414996.1.211223407]'
       BaseType: 'WebCheckbox'
       Properties:
       [
@@ -58,7 +58,7 @@
     }
     Component CheckboxCurve
     {
-      #keys: '[412672.0.1109206611]'
+      #keys: '[414996.1.211223408]'
       BaseType: 'WebCheckbox'
       Properties:
       [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245\0431.def"
deleted file mode 100644
index 83890a6..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage245 id:listActionBarPage245_1
-{
-  #keys: '[414996.1.192703109]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
new file mode 100644
index 0000000..fa7a1ce
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage245.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage245
+{
+  #keys: '[414996.1.211223077]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519\0431.def"
deleted file mode 100644
index c10a2e3..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage519 id:listActionBarPage519_1
-{
-  #keys: '[414996.1.192703118]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
new file mode 100644
index 0000000..42071fc
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage519.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage519
+{
+  #keys: '[414996.1.211223068]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963\0431.def"
deleted file mode 100644
index 32a6d6e..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage963 id:listActionBarPage963_1
-{
-  #keys: '[414996.1.192703100]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
new file mode 100644
index 0000000..f655583
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listActionBarPage963.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage963
+{
+  #keys: '[414996.1.211223086]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319\0431.def"
deleted file mode 100644
index 8122638..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu319 id:listContextMenu319_1
-{
-  #keys: '[414996.1.192703120]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
new file mode 100644
index 0000000..11260c8
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu319.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu319
+{
+  #keys: '[414996.1.211223070]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623\0431.def"
deleted file mode 100644
index f9215a6..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu623 id:listContextMenu623_1
-{
-  #keys: '[414996.1.192703111]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
new file mode 100644
index 0000000..04ce6fb
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu623.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu623
+{
+  #keys: '[414996.1.211223079]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687\0431.def"
deleted file mode 100644
index df65dd0..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu687 id:listContextMenu687_1
-{
-  #keys: '[414996.1.192703102]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
new file mode 100644
index 0000000..c136f63
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_listContextMenu687.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu687
+{
+  #keys: '[414996.1.211223088]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def"
similarity index 86%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def"
copy to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def"
index f0083f7..7726572 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixEditorActionBarPageDemandComparison\0431.def"
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component matrixEditorActionBarPageDemandComparison id:matrixEditorActionBarPageDemandComparison_1
 {
-  #keys: '[412672.1.61940681]'
+  #keys: '[414996.1.211223496]'
   BaseType: 'matrixEditorActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixEditorActionBarPageDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixEditorActionBarPageDemandComparison.def
deleted file mode 100644
index d36c6a6..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixEditorActionBarPageDemandComparison.def
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component matrixEditorActionBarPageDemandComparison
-{
-  #keys: '[412672.0.1085881209]'
-  BaseType: 'matrixEditorActionBarPage'
-  Properties:
-  [
-    Taborder: 3
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixeditorContextMenuDemandComparison\0431.def"
similarity index 86%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison\0431.def"
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixeditorContextMenuDemandComparison\0431.def"
index 5cd9345..1b2a228 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison\0431.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixeditorContextMenuDemandComparison\0431.def"
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component matrixeditorContextMenuDemandComparison id:matrixeditorContextMenuDemandComparison_1
 {
-  #keys: '[412672.1.61940682]'
+  #keys: '[414996.1.211223497]'
   BaseType: 'matrixeditorContextMenu'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
index 7834816..7dd3886 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_PanelDemandComparison.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pDemandComparison\043822.def"
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component PanelDemandComparison
+Component pDemandComparison id:pDemandComparison_822
 {
-  #keys: '[412672.0.1085881181]'
+  #keys: '[414996.1.211223488]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: MatrixEditor
     Component dhComparisonData
     {
-      #keys: '[412672.0.1085881305]'
+      #keys: '[414996.1.211223498]'
       BaseType: 'WebDataHolder'
       Databinding: 'LocalTable'
       Properties:
@@ -18,14 +17,14 @@
     }
     Component dhCheckedProduct
     {
-      #keys: '[412672.0.1121211408]'
+      #keys: '[414996.1.211223499]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Children:
       [
         Component deCheckedProduct
         {
-          #keys: '[412672.0.1121633584]'
+          #keys: '[414996.1.211223500]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -43,7 +42,7 @@
     }
     Component dhFinelProduct
     {
-      #keys: '[412672.0.1121876690]'
+      #keys: '[414996.1.211223501]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Properties:
@@ -53,14 +52,14 @@
     }
     Component dhCheckedSalesSegment
     {
-      #keys: '[412672.0.1122338152]'
+      #keys: '[414996.1.211223502]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[SalesSegment_MP]*'
       Children:
       [
         Component deCheckedSalesSegment
         {
-          #keys: '[412672.0.1122072068]'
+          #keys: '[414996.1.211223503]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -76,9 +75,10 @@
         Taborder: 4
       ]
     }
+    #child: MatrixEditor_298
   ]
   Properties:
   [
-    Taborder: 2
+    Taborder: 1
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration\043100.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration\043100.def"
deleted file mode 100644
index 33ec3f7..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration\043100.def"
+++ /dev/null
@@ -1,52 +0,0 @@
-Quintiq file version 2.0
-Component pGeneration id:pGeneration_100
-{
-  #keys: '[414996.1.192703097]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: ListGenerations_61
-    Component dhGenerations
-    {
-      #keys: '[414996.1.192703103]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component dhCheckGenerations
-    {
-      #keys: '[414996.1.192703104]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Children:
-      [
-        Component deCheckGenerations
-        {
-          #keys: '[414996.1.192703105]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[LocalValue]'
-            FixedFilter: 'object.IsCheck()'
-            Source: 'dhGenerations'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    MinimumRows: 20
-    Taborder: 0
-    Title: 'Generation'
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
similarity index 79%
rename from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
index 397397e..ec94058 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pGeneration.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pGeneration id:pGeneration_100
+Component pGeneration
 {
-  #keys: '[414996.1.191962760]'
+  #keys: '[414996.1.211223082]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListGenerations_61
     Component dhGenerations
     {
-      #keys: '[414996.1.191962766]'
+      #keys: '[414996.1.211223083]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,16 +15,17 @@
         Taborder: 1
       ]
     }
+    #child: ListGenerations
     Component dhCheckGenerations
     {
-      #keys: '[414996.1.191962767]'
+      #keys: '[414996.1.211223089]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckGenerations
         {
-          #keys: '[414996.1.191962768]'
+          #keys: '[414996.1.211223090]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB\043653.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
similarity index 80%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB\043653.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
index 9e50a4f..bc61124 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB\043653.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pMQBMLB id:pMQBMLB_653
+Component pMQBMLB
 {
-  #keys: '[414996.1.192703115]'
+  #keys: '[414996.1.211223064]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListMQBMLB_670
     Component dhMQBMLB
     {
-      #keys: '[414996.1.192703121]'
+      #keys: '[414996.1.211223065]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,16 +15,17 @@
         Taborder: 1
       ]
     }
+    #child: ListMQBMLB
     Component dhCheckMQBMLB
     {
-      #keys: '[414996.1.192703122]'
+      #keys: '[414996.1.211223071]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckMQBMLB
         {
-          #keys: '[414996.1.192703123]'
+          #keys: '[414996.1.211223072]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainLeft\043250.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainLeft\043250.def"
new file mode 100644
index 0000000..762419f
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainLeft\043250.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainLeft id:pMainLeft_250
+{
+  #keys: '[414996.1.211223062]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pProductAttributeFilter
+  ]
+  Properties:
+  [
+    FixedSize: true
+    MinimumColumns: 40
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainPanel\043767.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainPanel\043767.def"
new file mode 100644
index 0000000..7a328b8
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainPanel\043767.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainPanel id:pMainPanel_767
+{
+  #keys: '[414996.1.211223024]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMainRight_813
+    #child: pMainLeft_250
+  ]
+  Properties:
+  [
+    Orientation: 'horizontal'
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainRight\043813.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainRight\043813.def"
new file mode 100644
index 0000000..157f445
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMainRight\043813.def"
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component pMainRight id:pMainRight_813
+{
+  #keys: '[414996.1.211223025]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pRibbon_981
+    #child: pDemandComparison_822
+  ]
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower\043969.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower\043969.def"
deleted file mode 100644
index 2780fe5..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower\043969.def"
+++ /dev/null
@@ -1,52 +0,0 @@
-Quintiq file version 2.0
-Component pPower id:pPower_969
-{
-  #keys: '[414996.1.192703106]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: ListPowers_667
-    Component dhPowers
-    {
-      #keys: '[414996.1.192703112]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component dhCheckPowers
-    {
-      #keys: '[414996.1.192703113]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Children:
-      [
-        Component deCheckPowers
-        {
-          #keys: '[414996.1.192703114]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[LocalValue]'
-            FixedFilter: 'object.IsCheck()'
-            Source: 'dhPowers'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    MinimumRows: 20
-    Taborder: 1
-    Title: 'Power'
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
similarity index 80%
copy from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
index bd0332c..9751775 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pPower.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pPower id:pPower_969
+Component pPower
 {
-  #keys: '[414996.1.191962769]'
+  #keys: '[414996.1.211223073]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListPowers_667
     Component dhPowers
     {
-      #keys: '[414996.1.191962775]'
+      #keys: '[414996.1.211223074]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,16 +15,17 @@
         Taborder: 1
       ]
     }
+    #child: ListPowers
     Component dhCheckPowers
     {
-      #keys: '[414996.1.191962776]'
+      #keys: '[414996.1.211223080]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
         Component deCheckPowers
         {
-          #keys: '[414996.1.191962777]'
+          #keys: '[414996.1.211223081]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter\043697.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter\043697.def"
deleted file mode 100644
index 586ce0e..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter\043697.def"
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-Component pProductAttributeFilter id:pProductAttributeFilter_697
-{
-  #keys: '[414996.1.192703096]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: pGeneration_100
-    #child: pPower_969
-    #child: pMQBMLB_653
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
new file mode 100644
index 0000000..e536a45
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pProductAttributeFilter.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component pProductAttributeFilter
+{
+  #keys: '[414996.1.211223063]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMQBMLB
+    #child: pPower
+    #child: pGeneration
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pRibbon\043981.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pRibbon\043981.def"
new file mode 100644
index 0000000..57c3000
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pRibbon\043981.def"
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component pRibbon id:pRibbon_981
+{
+  #keys: '[414996.1.211223358]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: PanelFilter_137
+    #child: PanelOperation
+    #child: PanelSelection_985
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget\043753.def"
similarity index 86%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget\043753.def"
index 31aa97b..9d4cc89 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionBudget\043753.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component pSelectionBudget
+Component pSelectionBudget id:pSelectionBudget_753
 {
-  #keys: '[412672.0.1109211897]'
+  #keys: '[414996.1.211223367]'
   BaseType: 'WebPanel'
   Children:
   [
     Component DropDownListBaseVersionBudget
     {
-      #keys: '[412672.0.1109211898]'
+      #keys: '[414996.1.211223368]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchiveBudget'
       Children:
       [
         Component DataExtractorOperation221
         {
-          #keys: '[412672.0.1109211899]'
+          #keys: '[414996.1.211223369]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -36,7 +36,7 @@
     }
     Component dhBaseVersionBudget
     {
-      #keys: '[412672.0.1109211900]'
+      #keys: '[414996.1.211223370]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchiveBudget'
       Properties:
@@ -46,14 +46,14 @@
     }
     Component DropDownListCompareVersionBudget
     {
-      #keys: '[412672.0.1109211901]'
+      #keys: '[414996.1.211223371]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchiveBudget'
       Children:
       [
         Component DataExtractorOperation655
         {
-          #keys: '[412672.0.1109211902]'
+          #keys: '[414996.1.211223372]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -77,7 +77,7 @@
     }
     Component bSelectionChecks703
     {
-      #keys: '[414996.1.13998618]'
+      #keys: '[414996.1.211223373]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve\043639.def"
similarity index 86%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve\043639.def"
index ff165bf..0dd9425 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionCurve\043639.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component pSelectionCurve
+Component pSelectionCurve id:pSelectionCurve_639
 {
-  #keys: '[412672.0.1109211963]'
+  #keys: '[414996.1.211223388]'
   BaseType: 'WebPanel'
   Children:
   [
     Component DropDownListBaseVersionCurve
     {
-      #keys: '[412672.0.1109211964]'
+      #keys: '[414996.1.211223389]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchiveCurve'
       Children:
       [
         Component DataExtractorOperation154
         {
-          #keys: '[412672.0.1109211965]'
+          #keys: '[414996.1.211223390]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -36,7 +36,7 @@
     }
     Component dhBaseVersionCurve
     {
-      #keys: '[412672.0.1109211966]'
+      #keys: '[414996.1.211223391]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchiveCurve'
       Properties:
@@ -46,14 +46,14 @@
     }
     Component DropDownListCompareVersionCurve
     {
-      #keys: '[412672.0.1109211967]'
+      #keys: '[414996.1.211223392]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchiveCurve'
       Children:
       [
         Component DataExtractorOperation687
         {
-          #keys: '[412672.0.1109211968]'
+          #keys: '[414996.1.211223393]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -77,7 +77,7 @@
     }
     Component bSelectionChecks422
     {
-      #keys: '[414996.1.13998648]'
+      #keys: '[414996.1.211223394]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS\0435.def"
similarity index 86%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS\0435.def"
index e0448f0..e5934de 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionIDS\0435.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component pSelectionIDS
+Component pSelectionIDS id:pSelectionIDS_5
 {
-  #keys: '[412672.0.1109211941]'
+  #keys: '[414996.1.211223381]'
   BaseType: 'WebPanel'
   Children:
   [
     Component DropDownListBaseVersionIDS
     {
-      #keys: '[412672.0.1109211942]'
+      #keys: '[414996.1.211223382]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchiveIDS'
       Children:
       [
         Component DataExtractorOperation504
         {
-          #keys: '[412672.0.1109211943]'
+          #keys: '[414996.1.211223383]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -36,7 +36,7 @@
     }
     Component dhBaseVersionIDS
     {
-      #keys: '[412672.0.1109211944]'
+      #keys: '[414996.1.211223384]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchiveIDS'
       Properties:
@@ -46,14 +46,14 @@
     }
     Component DropDownListCompareVersionIDS
     {
-      #keys: '[412672.0.1109211945]'
+      #keys: '[414996.1.211223385]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchiveIDS'
       Children:
       [
         Component DataExtractorOperation493
         {
-          #keys: '[412672.0.1109211946]'
+          #keys: '[414996.1.211223386]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -77,7 +77,7 @@
     }
     Component bSelectionChecks289
     {
-      #keys: '[414996.1.13998638]'
+      #keys: '[414996.1.211223387]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP\043270.def"
similarity index 87%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP\043270.def"
index 4801027..bb0be9a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPP\043270.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component pSelectionPP
+Component pSelectionPP id:pSelectionPP_270
 {
-  #keys: '[412672.0.1109211874]'
+  #keys: '[414996.1.211223395]'
   BaseType: 'WebPanel'
   Children:
   [
     Component DropDownListBaseVersionPP
     {
-      #keys: '[412672.0.1109211875]'
+      #keys: '[414996.1.211223396]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePP'
       Children:
       [
         Component DataExtractorOperation267
         {
-          #keys: '[412672.0.1109211876]'
+          #keys: '[414996.1.211223397]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -36,7 +36,7 @@
     }
     Component dhBaseVersionPP
     {
-      #keys: '[412672.0.1109211877]'
+      #keys: '[414996.1.211223398]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchivePP'
       Properties:
@@ -46,14 +46,14 @@
     }
     Component DropDownListCompareVersionPP
     {
-      #keys: '[412672.0.1109211878]'
+      #keys: '[414996.1.211223399]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePP'
       Children:
       [
         Component DataExtractorOperation510
         {
-          #keys: '[412672.0.1109211879]'
+          #keys: '[414996.1.211223400]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -77,7 +77,7 @@
     }
     Component bSelectionChecks687
     {
-      #keys: '[414996.1.13998608]'
+      #keys: '[414996.1.211223401]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA\043497.def"
similarity index 86%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA\043497.def"
index 8820f77..09fec94 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPPA\043497.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component pSelectionPPA
+Component pSelectionPPA id:pSelectionPPA_497
 {
-  #keys: '[412672.0.1109211919]'
+  #keys: '[414996.1.211223374]'
   BaseType: 'WebPanel'
   Children:
   [
     Component DropDownListBaseVersionPPA
     {
-      #keys: '[412672.0.1109211920]'
+      #keys: '[414996.1.211223375]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePPA'
       Children:
       [
         Component DataExtractorOperation300
         {
-          #keys: '[412672.0.1109211921]'
+          #keys: '[414996.1.211223376]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -36,7 +36,7 @@
     }
     Component dhBaseVersionPPA
     {
-      #keys: '[412672.0.1109211922]'
+      #keys: '[414996.1.211223377]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchivePPA'
       Properties:
@@ -46,14 +46,14 @@
     }
     Component DropDownListCompareVersionPPA
     {
-      #keys: '[412672.0.1109211923]'
+      #keys: '[414996.1.211223378]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePPA'
       Children:
       [
         Component DataExtractorOperation949
         {
-          #keys: '[412672.0.1109211924]'
+          #keys: '[414996.1.211223379]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -77,7 +77,7 @@
     }
     Component bSelectionChecks253
     {
-      #keys: '[414996.1.13998628]'
+      #keys: '[414996.1.211223380]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR\043478.def"
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR\043478.def"
index d1ecdbf..e46c475 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pSelectionPR\043478.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component pSelectionPR
+Component pSelectionPR id:pSelectionPR_478
 {
-  #keys: '[412672.0.1109203593]'
+  #keys: '[414996.1.211223360]'
   BaseType: 'WebPanel'
   Children:
   [
     Component DropDownListBaseVersionPR
     {
-      #keys: '[412672.0.1109203679]'
+      #keys: '[414996.1.211223361]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePR'
       Children:
       [
-        Component DataExtractorOperation id:DataExtractorOperation_866
+        Component DataExtractorOperation
         {
-          #keys: '[412672.0.1109203680]'
+          #keys: '[414996.1.211223362]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -36,7 +36,7 @@
     }
     Component dhBaseVersionPR
     {
-      #keys: '[412672.0.1109203707]'
+      #keys: '[414996.1.211223363]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchivePR'
       Properties:
@@ -46,14 +46,14 @@
     }
     Component DropDownListCompareVersionPR
     {
-      #keys: '[412672.0.1109203739]'
+      #keys: '[414996.1.211223364]'
       BaseType: 'WebDropDownList'
       Databinding: 'ArchivePR'
       Children:
       [
-        Component DataExtractorOperation876 id:DataExtractorOperation876_784
+        Component DataExtractorOperation876
         {
-          #keys: '[412672.0.1109203740]'
+          #keys: '[414996.1.211223365]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -77,7 +77,7 @@
     }
     Component bSelectionChecks700
     {
-      #keys: '[414996.1.13998597]'
+      #keys: '[414996.1.211223366]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation\043411.def"
similarity index 78%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation\043411.def"
index 4cb57ad..b835de4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pVersionInfomation\043411.def"
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component pVersionInfomation
+Component pVersionInfomation id:pVersionInfomation_411
 {
-  #keys: '[412672.0.1119852729]'
+  #keys: '[414996.1.211223414]'
   BaseType: 'WebPanel'
   Children:
   [
     Component dhCompareVersion
     {
-      #keys: '[414996.1.137780879]'
+      #keys: '[414996.1.211223415]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchiveFile'
       Properties:
@@ -17,7 +17,7 @@
     }
     Component dhBaseVersion
     {
-      #keys: '[414996.1.137780892]'
+      #keys: '[414996.1.211223416]'
       BaseType: 'WebDataHolder'
       Databinding: 'ArchiveFile'
       Properties:
@@ -27,7 +27,7 @@
     }
     Component lBaseVersionName
     {
-      #keys: '[414996.1.144422027]'
+      #keys: '[414996.1.211223417]'
       BaseType: 'WebLabel'
       Properties:
       [
@@ -39,7 +39,7 @@
     }
     Component lCompareVersionName
     {
-      #keys: '[414996.1.144422050]'
+      #keys: '[414996.1.211223418]'
       BaseType: 'WebLabel'
       Properties:
       [
@@ -52,6 +52,6 @@
   ]
   Properties:
   [
-    Taborder: 4
+    Taborder: 3
   ]
 }
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
index 242d357..ed75271 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListGenerations
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListGenerations_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211222998]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_670_OnClick.def
deleted file mode 100644
index db6d202..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_670_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListMQBMLB_670
-Response OnClick (
-  LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
-{
-  #keys: '[414996.1.197722745]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
index 242d357..b4b308b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListMQBMLB_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListMQBMLB
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListMQBMLB_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211223006]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_667_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_667_OnClick.def
deleted file mode 100644
index 34e063f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_667_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListPowers_667
-Response OnClick (
-  LocalValue selection
-) id:Response_ListPowers_667_OnClick
-{
-  #keys: '[414996.1.197722734]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
index 242d357..0f4c94a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListPowers_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListPowers
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListPowers_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211223002]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhComparisonData_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhComparisonData_OnDataChanged.def
deleted file mode 100644
index 16bd708..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhComparisonData_OnDataChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison/dhComparisonData
-Response OnDataChanged () id:Response_PanelDemandComparison_dhComparisonData_OnDataChanged
-{
-  #keys: '[412672.0.1093351461]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      PanelDemandComparison.Title( this.Data().Name() );
-    *]
-  }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonClearFilter_OnClick\043799.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def
similarity index 68%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonClearFilter_OnClick\043799.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def
index f7428fd..9b469f3 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonClearFilter_OnClick\043799.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonClearFilter_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter/ButtonClearFilter_474
-Response OnClick () id:Response_PanelFilter_119_ButtonClearFilter_OnClick_799
+#parent: PanelFilter_137/ButtonClearFilter
+Response OnClick () id:Response_PanelFilter_137_ButtonClearFilter_OnClick
 {
-  #keys: '[414996.1.116558837]'
+  #keys: '[414996.1.211223299]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def
index 7ee37b7..5e452da 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ButtonFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ButtonFilter485_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter/ButtonFilter
-Response OnClick () id:Response_PanelFilter_ButtonFilter_OnClick
+#parent: PanelFilter_137/ButtonFilter485
+Response OnClick () id:Response_PanelFilter_137_ButtonFilter485_OnClick
 {
-  #keys: '[412672.0.1121729757]'
+  #keys: '[414996.1.211223302]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslGeneration_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslGeneration_OnCreated.def
similarity index 74%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslGeneration_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslGeneration_OnCreated.def
index d7286fc..53ada13 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslGeneration_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslGeneration_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ddslGeneration
-Response OnCreated () id:Response_PanelFilter_119_ddslGeneration_OnCreated
+#parent: PanelFilter_137/ddslGeneration
+Response OnCreated () id:Response_PanelFilter_137_ddslGeneration_OnCreated
 {
-  #keys: '[412672.1.61991353]'
+  #keys: '[414996.1.211223307]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslMQBMLB_OnCreated.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslMQBMLB_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslMQBMLB_OnCreated.def
index 3228a00..75028f8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslMQBMLB_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ddslMQBMLB
-Response OnCreated () id:Response_PanelFilter_119_ddslMQBMLB_OnCreated
+#parent: PanelFilter_137/ddslMQBMLB
+Response OnCreated () id:Response_PanelFilter_137_ddslMQBMLB_OnCreated
 {
-  #keys: '[412672.1.61991352]'
+  #keys: '[414996.1.211223306]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslPower_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslPower_OnCreated.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslPower_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslPower_OnCreated.def
index 7d8370b..315a2f4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ddslPower_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_ddslPower_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ddslPower
-Response OnCreated () id:Response_PanelFilter_119_ddslPower_OnCreated
+#parent: PanelFilter_137/ddslPower
+Response OnCreated () id:Response_PanelFilter_137_ddslPower_OnCreated
 {
-  #keys: '[412672.1.61991351]'
+  #keys: '[414996.1.211223305]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhEndDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhEndDate_OnCreated.def
similarity index 62%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhEndDate_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhEndDate_OnCreated.def
index 2aedb4a..08ccb40 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhEndDate_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhEndDate_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dhEndDate
-Response OnCreated () id:Response_PanelFilter_119_dhEndDate_OnCreated
+#parent: PanelFilter_137/dhEndDate
+Response OnCreated () id:Response_PanelFilter_137_dhEndDate_OnCreated
 {
-  #keys: '[412672.1.61991346]'
+  #keys: '[414996.1.211223300]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhStartDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhStartDate_OnCreated.def
similarity index 62%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhStartDate_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhStartDate_OnCreated.def
index a2dc135..de983a1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dhStartDate_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dhStartDate_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dhStartDate
-Response OnCreated () id:Response_PanelFilter_119_dhStartDate_OnCreated
+#parent: PanelFilter_137/dhStartDate
+Response OnCreated () id:Response_PanelFilter_137_dhStartDate_OnCreated
 {
-  #keys: '[412672.1.61991347]'
+  #keys: '[414996.1.211223301]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsEndDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsEndDate_OnChanged.def
similarity index 63%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsEndDate_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsEndDate_OnChanged.def
index 79ee881..c282438 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsEndDate_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsEndDate_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dsEndDate
-Response OnChanged () id:Response_PanelFilter_119_dsEndDate_OnChanged
+#parent: PanelFilter_137/dsEndDate
+Response OnChanged () id:Response_PanelFilter_137_dsEndDate_OnChanged
 {
-  #keys: '[412672.1.61991349]'
+  #keys: '[414996.1.211223303]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsStartDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsStartDate_OnChanged.def
similarity index 63%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsStartDate_OnChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsStartDate_OnChanged.def
index 1b7e133..56791d6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_dsStartDate_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_137_dsStartDate_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/dsStartDate
-Response OnChanged () id:Response_PanelFilter_119_dsStartDate_OnChanged
+#parent: PanelFilter_137/dsStartDate
+Response OnChanged () id:Response_PanelFilter_137_dsStartDate_OnChanged
 {
-  #keys: '[412672.1.61991350]'
+  #keys: '[414996.1.211223304]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslGeneration_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslGeneration_OnCreated.def
deleted file mode 100644
index e5c27fc..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslGeneration_OnCreated.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/ddslGeneration
-Response OnCreated () id:Response_PanelFilter_ddslGeneration_OnCreated
-{
-  #keys: '[412672.0.1121755350]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      strings := selectuniquevalues( MacroPlan,Product_MP,product,not product.IsSystem(),product.Generation() );
-      
-      res := strings.Concatenate( ";" );
-      
-      this.Strings( "<All>;" + res );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslMQBMLB_OnCreated.def
deleted file mode 100644
index 209a4ce..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslMQBMLB_OnCreated.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/ddslMQBMLB
-Response OnCreated () id:Response_PanelFilter_ddslMQBMLB_OnCreated
-{
-  #keys: '[412672.0.1121815924]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      strings := selectuniquevalues( MacroPlan,Product_MP,product,not product.IsSystem(),product.MQBMLB() );
-      
-      res := strings.Concatenate( ";" );
-      
-      this.Strings( "<All>;" + res );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslPower_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslPower_OnCreated.def
deleted file mode 100644
index e419a94..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_ddslPower_OnCreated.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/ddslPower
-Response OnCreated () id:Response_PanelFilter_ddslPower_OnCreated
-{
-  #keys: '[412672.0.1121816007]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      strings := selectuniquevalues( MacroPlan,Product_MP,product,not product.IsSystem(),product.Power() );
-      
-      res := strings.Concatenate( ";" );
-      
-      this.Strings( "<All>;" + res );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dhEndDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dhEndDate_OnCreated.def
deleted file mode 100644
index 23bc52c..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dhEndDate_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/dhEndDate
-Response OnCreated () id:Response_PanelFilter_dhEndDate_OnCreated
-{
-  #keys: '[412672.0.1122841072]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( Date::MaxDate() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dsEndDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dsEndDate_OnChanged.def
deleted file mode 100644
index 0f579a8..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dsEndDate_OnChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/dsEndDate
-Response OnChanged () id:Response_PanelFilter_dsEndDate_OnChanged
-{
-  #keys: '[412672.0.1122665296]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      dhEndDate.Data( this.Date() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dsStartDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dsStartDate_OnChanged.def
deleted file mode 100644
index eaa6855..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dsStartDate_OnChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelFilter/dsStartDate
-Response OnChanged () id:Response_PanelFilter_dsStartDate_OnChanged
-{
-  #keys: '[412672.0.1122665180]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      dhStartDate.Data( this.Date() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bMaintainArchivedFiles_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bMaintainArchivedFiles_OnClick.def
deleted file mode 100644
index c0d561f..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bMaintainArchivedFiles_OnClick.def
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelOperation_568/bMaintainArchivedFiles
-Response OnClick () id:Response_PanelOperation_568_bMaintainArchivedFiles_OnClick
-{
-  #keys: '[414996.1.144820904]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebButton_OnClick'
-  QuillAction
-  {
-    Body:
-    [*
-      dlg := construct( DialogMaintainArchivedFiles );
-      dlg.Create();
-    *]
-    GroupServerCalls: false
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def
similarity index 77%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def
index 4298bba..559df7f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_ButtonCompare_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_ButtonCompare_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelOperation_568/ButtonCompare
-Response OnClick () id:Response_PanelOperation_568_ButtonCompare_OnClick
+#parent: PanelOperation/ButtonCompare
+Response OnClick () id:Response_PanelOperation_ButtonCompare_OnClick
 {
-  #keys: '[412672.0.1111643148]'
+  #keys: '[414996.1.211223313]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   Precondition:
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def
similarity index 81%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def
index 9328737..c1cfd41 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_bExport_OnClick\043723.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_bExport_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelOperation_568/bExport_98
-Response OnClick () id:Response_pOperation_bExport_OnClick_723
+#parent: PanelOperation/bExport
+Response OnClick () id:Response_PanelOperation_bExport_OnClick
 {
-  #keys: '[412672.0.1109203509]'
+  #keys: '[414996.1.211223311]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_dhXMLDataListener_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_dhXMLDataListener_OnDataChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_dhXMLDataListener_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_dhXMLDataListener_OnDataChanged.def
index 62621bc..dbf2fb8 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_568_dhXMLDataListener_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelOperation_dhXMLDataListener_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelOperation_568/dhXMLDataListener_906
-Response OnDataChanged () id:Response_PanelOperation_568_dhXMLDataListener_OnDataChanged
+#parent: PanelOperation/dhXMLDataListener
+Response OnDataChanged () id:Response_PanelOperation_dhXMLDataListener_OnDataChanged
 {
-  #keys: '[414996.1.135031114]'
+  #keys: '[414996.1.211223312]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxBudget_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxBudget_OnChanged.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxBudget_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxBudget_OnChanged.def
index 69a5674..f8a0ef9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxBudget_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxBudget_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelSelectionChecks/CheckboxBudget
-Response OnChanged () id:Response_PanelSelectionChecks_CheckboxBudget_OnChanged
+#parent: PanelSelectionChecks_369/CheckboxBudget
+Response OnChanged () id:Response_PanelSelectionChecks_369_CheckboxBudget_OnChanged
 {
-  #keys: '[412672.0.1112392619]'
+  #keys: '[414996.1.211223335]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxCurve_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxCurve_OnChanged.def
similarity index 73%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxCurve_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxCurve_OnChanged.def
index 9f4e161..022becf 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxCurve_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxCurve_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelSelectionChecks/CheckboxCurve
-Response OnChanged () id:Response_PanelSelectionChecks_CheckboxCurve_OnChanged
+#parent: PanelSelectionChecks_369/CheckboxCurve
+Response OnChanged () id:Response_PanelSelectionChecks_369_CheckboxCurve_OnChanged
 {
-  #keys: '[412672.0.1109206610]'
+  #keys: '[414996.1.211223332]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxIDS_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxIDS_OnChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxIDS_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxIDS_OnChanged.def
index 1efc848..ea270f1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxIDS_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxIDS_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelSelectionChecks/CheckboxIDS
-Response OnChanged () id:Response_PanelSelectionChecks_CheckboxIDS_OnChanged
+#parent: PanelSelectionChecks_369/CheckboxIDS
+Response OnChanged () id:Response_PanelSelectionChecks_369_CheckboxIDS_OnChanged
 {
-  #keys: '[412672.0.1109206605]'
+  #keys: '[414996.1.211223333]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPPA_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPPA_OnChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPPA_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPPA_OnChanged.def
index 3b28cab..0352651 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPPA_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPPA_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelSelectionChecks/CheckboxPPA
-Response OnChanged () id:Response_PanelSelectionChecks_CheckboxPPA_OnChanged
+#parent: PanelSelectionChecks_369/CheckboxPPA
+Response OnChanged () id:Response_PanelSelectionChecks_369_CheckboxPPA_OnChanged
 {
-  #keys: '[412672.0.1112392624]'
+  #keys: '[414996.1.211223334]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPP_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPP_OnChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPP_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPP_OnChanged.def
index 952e57c..42379fe 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPP_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPP_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelSelectionChecks/CheckboxPP
-Response OnChanged () id:Response_PanelSelectionChecks_CheckboxPP_OnChanged
+#parent: PanelSelectionChecks_369/CheckboxPP
+Response OnChanged () id:Response_PanelSelectionChecks_369_CheckboxPP_OnChanged
 {
-  #keys: '[412672.0.1112392613]'
+  #keys: '[414996.1.211223336]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPR_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPR_OnChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPR_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPR_OnChanged.def
index 9d6811e..48a90cb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_CheckboxPR_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelSelectionChecks_369_CheckboxPR_OnChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelSelectionChecks/CheckboxPR
-Response OnChanged () id:Response_PanelSelectionChecks_CheckboxPR_OnChanged
+#parent: PanelSelectionChecks_369/CheckboxPR
+Response OnChanged () id:Response_PanelSelectionChecks_369_CheckboxPR_OnChanged
 {
-  #keys: '[412672.0.1112326553]'
+  #keys: '[414996.1.211223337]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebCheckbox_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhCheckedProduct_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhCheckedProduct_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged.def
index 038f6f7..e94b01d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhCheckedProduct_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhCheckedProduct
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckedProduct_OnDataChanged
+#parent: pDemandComparison_822/dhCheckedProduct
+Response OnDataChanged () id:Response_pDemandComparison_822_dhCheckedProduct_OnDataChanged
 {
-  #keys: '[412672.0.1122118230]'
+  #keys: '[414996.1.211223484]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhCheckedSalesSegment_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged.def
similarity index 77%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhCheckedSalesSegment_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged.def
index 1500156..9218b91 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhCheckedSalesSegment_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhCheckedSalesSegment
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckedSalesSegment_OnDataChanged
+#parent: pDemandComparison_822/dhCheckedSalesSegment
+Response OnDataChanged () id:Response_pDemandComparison_822_dhCheckedSalesSegment_OnDataChanged
 {
-  #keys: '[412672.0.1122600939]'
+  #keys: '[414996.1.211223482]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhComparisonData_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhComparisonData_OnDataChanged.def
new file mode 100644
index 0000000..fba738b
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhComparisonData_OnDataChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pDemandComparison_822/dhComparisonData
+Response OnDataChanged () id:Response_pDemandComparison_822_dhComparisonData_OnDataChanged
+{
+  #keys: '[414996.1.211223485]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pDemandComparison.Title( this.Data().Name() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhFinelProduct_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProduct_OnCreated.def
similarity index 63%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhFinelProduct_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProduct_OnCreated.def
index 306233c..f40738b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelDemandComparison_dhFinelProduct_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pDemandComparison_822_dhFinelProduct_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhFinelProduct
-Response OnCreated () id:Response_PanelDemandComparison_dhFinelProduct_OnCreated
+#parent: pDemandComparison_822/dhFinelProduct
+Response OnCreated () id:Response_pDemandComparison_822_dhFinelProduct_OnCreated
 {
-  #keys: '[412672.0.1122081581]'
+  #keys: '[414996.1.211223483]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
similarity index 80%
copy from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
index 416291b..bcbdb8a 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhCheckGenerations_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration_100/dhCheckGenerations
-Response OnDataChanged () id:Response_pGeneration_100_dhCheckGenerations_OnDataChanged
+#parent: pGeneration/dhCheckGenerations
+Response OnDataChanged () id:Response_pGeneration_dhCheckGenerations_OnDataChanged
 {
-  #keys: '[414996.1.192703090]'
+  #keys: '[414996.1.211222997]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhGenerations_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
index 3661a81..3592860 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_dhGenerations_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration_100/dhGenerations
-Response OnCreated () id:Response_pGeneration_100_dhGenerations_OnCreated
+#parent: pGeneration/dhGenerations
+Response OnCreated () id:Response_pGeneration_dhGenerations_OnCreated
 {
-  #keys: '[414996.1.192703091]'
+  #keys: '[414996.1.211223000]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
deleted file mode 100644
index bd8295a..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
+++ /dev/null
@@ -1,17 +0,0 @@
-Quintiq file version 2.0
-#parent: pMQBMLB_653/dhMQBMLB
-Response OnCreated () id:Response_pMQBMLB_653_dhMQBMLB_OnCreated
-{
-  #keys: '[414996.1.192703085]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  QuillAction
-  {
-    Body:
-    [*
-      generations := LocalValue::CreateProduct_MPAttribute( RecycleBin,MacroPlan,"mqbmlb" );
-      this.Data( &generations );
-    *]
-    GroupServerCalls: false
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
index 0aaeb78..4ed4a05 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB_653/dhCheckMQBMLB
-Response OnDataChanged () id:Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged
+#parent: pMQBMLB/dhCheckMQBMLB
+Response OnDataChanged () id:Response_pMQBMLB_dhCheckMQBMLB_OnDataChanged
 {
-  #keys: '[414996.1.192703084]'
+  #keys: '[414996.1.211223005]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
index b2eeb42..797a070 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_dhMQBMLB_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB_653/dhMQBMLB
-Response OnCreated () id:Response_pMQBMLB_653_dhMQBMLB_OnCreated
+#parent: pMQBMLB/dhMQBMLB
+Response OnCreated () id:Response_pMQBMLB_dhMQBMLB_OnCreated
 {
-  #keys: '[414996.1.191962748]'
+  #keys: '[414996.1.211223008]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
similarity index 82%
copy from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
index c8fa6c5..3471296 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhCheckPowers_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower_969/dhCheckPowers
-Response OnDataChanged () id:Response_pPower_969_dhCheckPowers_OnDataChanged
+#parent: pPower/dhCheckPowers
+Response OnDataChanged () id:Response_pPower_dhCheckPowers_OnDataChanged
 {
-  #keys: '[414996.1.192703087]'
+  #keys: '[414996.1.211223001]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhPowers_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
index 8a63d12..20ad743 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_dhPowers_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower_969/dhPowers
-Response OnCreated () id:Response_pPower_969_dhPowers_OnCreated
+#parent: pPower/dhPowers
+Response OnCreated () id:Response_pPower_dhPowers_OnCreated
 {
-  #keys: '[414996.1.192703088]'
+  #keys: '[414996.1.211223004]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListBaseVersionBudget_OnSelectionChang.def
similarity index 65%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListBaseVersionBudget_OnSelectionChang.def
index 48dce28..b699d87 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListBaseVersionBudget_OnSelectionChang.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionBudget/DropDownListBaseVersionBudget
+#parent: pSelectionBudget_753/DropDownListBaseVersionBudget
 Response OnSelectionChanged (
   ArchiveBudget selection
-) id:Response_pSelectionBudget_DropDownListBaseVersionBudget_OnSelectionChanged
+) id:Response_pSelectionBudget_753_DropDownListBaseVersionBudget_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211896]'
+  #keys: '[414996.1.211223354]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChange.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListCompareVersionBudget_OnSelectionCh.def
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChange.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListCompareVersionBudget_OnSelectionCh.def
index f0d762e..12e743f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChange.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_DropDownListCompareVersionBudget_OnSelectionCh.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionBudget/DropDownListCompareVersionBudget
+#parent: pSelectionBudget_753/DropDownListCompareVersionBudget
 Response OnSelectionChanged (
   ArchiveBudget selection
-) id:Response_pSelectionBudget_DropDownListCompareVersionBudget_OnSelectionChanged
+) id:Response_pSelectionBudget_753_DropDownListCompareVersionBudget_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211895]'
+  #keys: '[414996.1.211223352]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_bSelectionChecks703_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_bSelectionChecks703_OnClick.def
similarity index 68%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_bSelectionChecks703_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_bSelectionChecks703_OnClick.def
index 9fc65c2..c50b598 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_bSelectionChecks703_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_bSelectionChecks703_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionBudget/bSelectionChecks703
-Response OnClick () id:Response_pSelectionBudget_bSelectionChecks703_OnClick
+#parent: pSelectionBudget_753/bSelectionChecks703
+Response OnClick () id:Response_pSelectionBudget_753_bSelectionChecks703_OnClick
 {
-  #keys: '[414996.1.13998617]'
+  #keys: '[414996.1.211223351]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_dhBaseVersionBudget_OnDataChanged.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_dhBaseVersionBudget_OnDataChanged.def
index 0090826..8c3d4eb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_753_dhBaseVersionBudget_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionBudget/dhBaseVersionBudget
-Response OnDataChanged () id:Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged
+#parent: pSelectionBudget_753/dhBaseVersionBudget
+Response OnDataChanged () id:Response_pSelectionBudget_753_dhBaseVersionBudget_OnDataChanged
 {
-  #keys: '[414996.1.58018748]'
+  #keys: '[414996.1.211223353]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListBaseVersionCurve_OnSelectionChanged.def
similarity index 65%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListBaseVersionCurve_OnSelectionChanged.def
index bf8e3a1..6750431 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListBaseVersionCurve_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionCurve/DropDownListBaseVersionCurve
+#parent: pSelectionCurve_639/DropDownListBaseVersionCurve
 Response OnSelectionChanged (
   ArchiveCurve selection
-) id:Response_pSelectionCurve_DropDownListBaseVersionCurve_OnSelectionChanged
+) id:Response_pSelectionCurve_639_DropDownListBaseVersionCurve_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211962]'
+  #keys: '[414996.1.211223344]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListCompareVersionCurve_OnSelectionChan.def
similarity index 61%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListCompareVersionCurve_OnSelectionChan.def
index 6957d5b..badcaf4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_DropDownListCompareVersionCurve_OnSelectionChan.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionCurve/DropDownListCompareVersionCurve
+#parent: pSelectionCurve_639/DropDownListCompareVersionCurve
 Response OnSelectionChanged (
   ArchiveCurve selection
-) id:Response_pSelectionCurve_DropDownListCompareVersionCurve_OnSelectionChanged
+) id:Response_pSelectionCurve_639_DropDownListCompareVersionCurve_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211961]'
+  #keys: '[414996.1.211223343]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_bSelectionChecks422_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_bSelectionChecks422_OnClick.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_bSelectionChecks422_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_bSelectionChecks422_OnClick.def
index 2fd1422..5fef6c7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_bSelectionChecks422_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionCurve_639_bSelectionChecks422_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionCurve/bSelectionChecks422
-Response OnClick () id:Response_pSelectionCurve_bSelectionChecks422_OnClick
+#parent: pSelectionCurve_639/bSelectionChecks422
+Response OnClick () id:Response_pSelectionCurve_639_bSelectionChecks422_OnClick
 {
-  #keys: '[414996.1.13998647]'
+  #keys: '[414996.1.211223342]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListBaseVersionIDS_OnSelectionChanged.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListBaseVersionIDS_OnSelectionChanged.def
index 7167c4a..949dd2f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListBaseVersionIDS_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionIDS/DropDownListBaseVersionIDS
+#parent: pSelectionIDS_5/DropDownListBaseVersionIDS
 Response OnSelectionChanged (
   ArchiveIDS selection
-) id:Response_pSelectionIDS_DropDownListBaseVersionIDS_OnSelectionChanged
+) id:Response_pSelectionIDS_5_DropDownListBaseVersionIDS_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211940]'
+  #keys: '[414996.1.211223347]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListCompareVersionIDS_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListCompareVersionIDS_OnSelectionChanged.def
similarity index 63%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListCompareVersionIDS_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListCompareVersionIDS_OnSelectionChanged.def
index ef6050f..e5a8453 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_DropDownListCompareVersionIDS_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_DropDownListCompareVersionIDS_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionIDS/DropDownListCompareVersionIDS
+#parent: pSelectionIDS_5/DropDownListCompareVersionIDS
 Response OnSelectionChanged (
   ArchiveIDS selection
-) id:Response_pSelectionIDS_DropDownListCompareVersionIDS_OnSelectionChanged
+) id:Response_pSelectionIDS_5_DropDownListCompareVersionIDS_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211939]'
+  #keys: '[414996.1.211223346]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_bSelectionChecks289_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_bSelectionChecks289_OnClick.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_bSelectionChecks289_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_bSelectionChecks289_OnClick.def
index a99e87e..5fd1a45 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_bSelectionChecks289_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionIDS_5_bSelectionChecks289_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionIDS/bSelectionChecks289
-Response OnClick () id:Response_pSelectionIDS_bSelectionChecks289_OnClick
+#parent: pSelectionIDS_5/bSelectionChecks289
+Response OnClick () id:Response_pSelectionIDS_5_bSelectionChecks289_OnClick
 {
-  #keys: '[414996.1.13998637]'
+  #keys: '[414996.1.211223345]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListBaseVersionPPA_OnSelectionChanged.def
similarity index 66%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListBaseVersionPPA_OnSelectionChanged.def
index ebeef7c..4ad221b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListBaseVersionPPA_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionPPA/DropDownListBaseVersionPPA
+#parent: pSelectionPPA_497/DropDownListBaseVersionPPA
 Response OnSelectionChanged (
   ArchivePPA selection
-) id:Response_pSelectionPPA_DropDownListBaseVersionPPA_OnSelectionChanged
+) id:Response_pSelectionPPA_497_DropDownListBaseVersionPPA_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211918]'
+  #keys: '[414996.1.211223350]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListCompareVersionPPA_OnSelectionChanged.def
similarity index 62%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListCompareVersionPPA_OnSelectionChanged.def
index 987f945..e2c0e74 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_DropDownListCompareVersionPPA_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionPPA/DropDownListCompareVersionPPA
+#parent: pSelectionPPA_497/DropDownListCompareVersionPPA
 Response OnSelectionChanged (
   ArchivePPA selection
-) id:Response_pSelectionPPA_DropDownListCompareVersionPPA_OnSelectionChanged
+) id:Response_pSelectionPPA_497_DropDownListCompareVersionPPA_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211917]'
+  #keys: '[414996.1.211223349]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_bSelectionChecks253_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_bSelectionChecks253_OnClick.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_bSelectionChecks253_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_bSelectionChecks253_OnClick.def
index 8d93bb3..dd24a3f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_bSelectionChecks253_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPPA_497_bSelectionChecks253_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionPPA/bSelectionChecks253
-Response OnClick () id:Response_pSelectionPPA_bSelectionChecks253_OnClick
+#parent: pSelectionPPA_497/bSelectionChecks253
+Response OnClick () id:Response_pSelectionPPA_497_bSelectionChecks253_OnClick
 {
-  #keys: '[414996.1.13998627]'
+  #keys: '[414996.1.211223348]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListBaseVersionPP_OnSelectionChanged.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListBaseVersionPP_OnSelectionChanged.def
index adeff4f..276054f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListBaseVersionPP_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionPP/DropDownListBaseVersionPP
+#parent: pSelectionPP_270/DropDownListBaseVersionPP
 Response OnSelectionChanged (
   ArchivePP selection
-) id:Response_pSelectionPP_DropDownListBaseVersionPP_OnSelectionChanged
+) id:Response_pSelectionPP_270_DropDownListBaseVersionPP_OnSelectionChanged
 {
-  #keys: '[414996.1.62811858]'
+  #keys: '[414996.1.211223341]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListCompareVersionPP_OnSelectionChanged.def
similarity index 63%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListCompareVersionPP_OnSelectionChanged.def
index 346ce19..b7cdebc 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_DropDownListCompareVersionPP_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionPP/DropDownListCompareVersionPP
+#parent: pSelectionPP_270/DropDownListCompareVersionPP
 Response OnSelectionChanged (
   ArchivePP selection
-) id:Response_pSelectionPP_DropDownListCompareVersionPP_OnSelectionChanged
+) id:Response_pSelectionPP_270_DropDownListCompareVersionPP_OnSelectionChanged
 {
-  #keys: '[412672.0.1109211872]'
+  #keys: '[414996.1.211223339]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_bSelectionChecks687_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_bSelectionChecks687_OnClick.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_bSelectionChecks687_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_bSelectionChecks687_OnClick.def
index 68e43d4..fced749 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_bSelectionChecks687_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_bSelectionChecks687_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionPP/bSelectionChecks687
-Response OnClick () id:Response_pSelectionPP_bSelectionChecks687_OnClick
+#parent: pSelectionPP_270/bSelectionChecks687
+Response OnClick () id:Response_pSelectionPP_270_bSelectionChecks687_OnClick
 {
-  #keys: '[414996.1.13998607]'
+  #keys: '[414996.1.211223338]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_dhBaseVersionPP_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_dhBaseVersionPP_OnDataChanged.def
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_dhBaseVersionPP_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_dhBaseVersionPP_OnDataChanged.def
index 658bfa1..2505523 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_dhBaseVersionPP_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_270_dhBaseVersionPP_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionPP/dhBaseVersionPP
-Response OnDataChanged () id:Response_pSelectionPP_dhBaseVersionPP_OnDataChanged
+#parent: pSelectionPP_270/dhBaseVersionPP
+Response OnDataChanged () id:Response_pSelectionPP_270_dhBaseVersionPP_OnDataChanged
 {
-  #keys: '[414996.1.55350834]'
+  #keys: '[414996.1.211223340]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   QuillAction
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged\04398.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListBaseVersionPR_OnSelectionChanged.def
similarity index 66%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged\04398.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListBaseVersionPR_OnSelectionChanged.def
index 922afef..a67d12c 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged\04398.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListBaseVersionPR_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionPR/DropDownListBaseVersionPR
+#parent: pSelectionPR_478/DropDownListBaseVersionPR
 Response OnSelectionChanged (
   ArchivePR selection
-) id:Response_pSelectionPR_DropDownListBaseVersionPR_OnSelectionChanged_98
+) id:Response_pSelectionPR_478_DropDownListBaseVersionPR_OnSelectionChanged
 {
-  #keys: '[412672.0.1109203677]'
+  #keys: '[414996.1.211223357]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged\043599.def" b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListCompareVersionPR_OnSelectionChanged.def
similarity index 62%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged\043599.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListCompareVersionPR_OnSelectionChanged.def
index 3a67c17..2d5e361 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged\043599.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_DropDownListCompareVersionPR_OnSelectionChanged.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: pSelectionPR/DropDownListCompareVersionPR
+#parent: pSelectionPR_478/DropDownListCompareVersionPR
 Response OnSelectionChanged (
   ArchivePR selection
-) id:Response_pSelectionPR_DropDownListCompareVersionPR_OnSelectionChanged_599
+) id:Response_pSelectionPR_478_DropDownListCompareVersionPR_OnSelectionChanged
 {
-  #keys: '[412672.0.1109203737]'
+  #keys: '[414996.1.211223356]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDropDownList_OnSelectionChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_bSelectionChecks700_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_bSelectionChecks700_OnClick.def
similarity index 69%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_bSelectionChecks700_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_bSelectionChecks700_OnClick.def
index 9e217b4..26e93d5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_bSelectionChecks700_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPR_478_bSelectionChecks700_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pSelectionPR/bSelectionChecks700
-Response OnClick () id:Response_pSelectionPR_bSelectionChecks700_OnClick
+#parent: pSelectionPR_478/bSelectionChecks700
+Response OnClick () id:Response_pSelectionPR_478_bSelectionChecks700_OnClick
 {
-  #keys: '[414996.1.13998596]'
+  #keys: '[414996.1.211223355]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
index 2ec5105..0c8c1ff 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/_ROOT_Component_FormDemandComparison.def
@@ -7,9 +7,7 @@
   BaseType: 'WebForm'
   Children:
   [
-    #child: PanelDemandComparison
-    #child: PanelDemandComparison294
-    #child: pProductAttributeFilter_697
+    #child: pMainPanel_767
   ]
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations\04361.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations\04361.def"
deleted file mode 100644
index 71b1395..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations\04361.def"
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListGenerations id:ListGenerations_61
-{
-  #keys: '[414996.1.191962661]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor989
-    {
-      #keys: '[414996.1.191962662]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhGenerations'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage963_1
-    Component DataSetLevel191
-    {
-      #keys: '[414996.1.191962664]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu687_1
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu687'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def
similarity index 71%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def
index f853c10..5502cb5 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListGenerations366.def
@@ -1,35 +1,35 @@
 Quintiq file version 2.0
-Component ListMQBMLB id:ListMQBMLB_670
+Component ListGenerations366
 {
-  #keys: '[414996.1.191962679]'
+  #keys: '[414996.1.211222181]'
   BaseType: 'WebList'
   Children:
   [
-    Component DataExtractor472
+    Component DataExtractor532
     {
-      #keys: '[414996.1.191962680]'
+      #keys: '[414996.1.211222182]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
         DataType: 'structured[LocalValue]'
-        Source: 'dhMQBMLB'
+        Source: 'dhGenerations423'
         Taborder: 0
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage519_1
-    Component DataSetLevel527
+    #child: listActionBarPage206
+    Component DataSetLevel174
     {
-      #keys: '[414996.1.191962682]'
+      #keys: '[414996.1.211222184]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu319_1
+        #child: listContextMenu936
       ]
       Properties:
       [
         Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu319'
+        ContextMenu: 'listContextMenu936'
         Taborder: 2
       ]
     }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def
similarity index 71%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def
index f853c10..43fa536 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB700.def
@@ -1,35 +1,35 @@
 Quintiq file version 2.0
-Component ListMQBMLB id:ListMQBMLB_670
+Component ListMQBMLB700
 {
-  #keys: '[414996.1.191962679]'
+  #keys: '[414996.1.211222163]'
   BaseType: 'WebList'
   Children:
   [
-    Component DataExtractor472
+    Component DataExtractor687
     {
-      #keys: '[414996.1.191962680]'
+      #keys: '[414996.1.211222164]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
         DataType: 'structured[LocalValue]'
-        Source: 'dhMQBMLB'
+        Source: 'dhMQBMLB972'
         Taborder: 0
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage519_1
-    Component DataSetLevel527
+    #child: listActionBarPage703
+    Component DataSetLevel671
     {
-      #keys: '[414996.1.191962682]'
+      #keys: '[414996.1.211222166]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu319_1
+        #child: listContextMenu245
       ]
       Properties:
       [
         Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu319'
+        ContextMenu: 'listContextMenu245'
         Taborder: 2
       ]
     }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers\043667.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers\043667.def"
deleted file mode 100644
index a7a53c5..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers\043667.def"
+++ /dev/null
@@ -1,41 +0,0 @@
-Quintiq file version 2.0
-Component ListPowers id:ListPowers_667
-{
-  #keys: '[414996.1.191962670]'
-  BaseType: 'WebList'
-  Children:
-  [
-    Component DataExtractor671
-    {
-      #keys: '[414996.1.191962671]'
-      BaseType: 'WebDataExtractor'
-      Properties:
-      [
-        DataType: 'structured[LocalValue]'
-        Source: 'dhPowers'
-        Taborder: 0
-        Transformation: 'Elements'
-      ]
-    }
-    #child: listActionBarPage245_1
-    Component DataSetLevel995
-    {
-      #keys: '[414996.1.191962673]'
-      BaseType: 'WebDataSetLevel'
-      Children:
-      [
-        #child: listContextMenu623_1
-      ]
-      Properties:
-      [
-        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu623'
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def
similarity index 71%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def
index f853c10..8365707 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListMQBMLB\043670.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_ListPowers199.def
@@ -1,35 +1,35 @@
 Quintiq file version 2.0
-Component ListMQBMLB id:ListMQBMLB_670
+Component ListPowers199
 {
-  #keys: '[414996.1.191962679]'
+  #keys: '[414996.1.211222172]'
   BaseType: 'WebList'
   Children:
   [
-    Component DataExtractor472
+    Component DataExtractor707
     {
-      #keys: '[414996.1.191962680]'
+      #keys: '[414996.1.211222173]'
       BaseType: 'WebDataExtractor'
       Properties:
       [
         DataType: 'structured[LocalValue]'
-        Source: 'dhMQBMLB'
+        Source: 'dhPowers404'
         Taborder: 0
         Transformation: 'Elements'
       ]
     }
-    #child: listActionBarPage519_1
-    Component DataSetLevel527
+    #child: listActionBarPage690
+    Component DataSetLevel558
     {
-      #keys: '[414996.1.191962682]'
+      #keys: '[414996.1.211222175]'
       BaseType: 'WebDataSetLevel'
       Children:
       [
-        #child: listContextMenu319_1
+        #child: listContextMenu979
       ]
       Properties:
       [
         Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsCheck","title":"IsCheck","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsCheck"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StringValue","title":"StringValue","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StringValue"}}]'
-        ContextMenu: 'listContextMenu319'
+        ContextMenu: 'listContextMenu979'
         Taborder: 2
       ]
     }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor.def
similarity index 86%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor.def
index 4dbbb3e..92dcc3f 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor\043988.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_MatrixEditor.def
@@ -1,19 +1,19 @@
 Quintiq file version 2.0
-Component MatrixEditor id:MatrixEditor_988
+Component MatrixEditor
 {
-  #keys: '[412672.1.61940674]'
+  #keys: '[414996.1.211222418]'
   BaseType: 'WebMatrixEditor'
   Children:
   [
     Component MatrixEditorCell
     {
-      #keys: '[412672.1.61940675]'
+      #keys: '[414996.1.211222419]'
       BaseType: 'WebMatrixEditorCell'
       Children:
       [
         Component DataExtractorCells
         {
-          #keys: '[412672.1.61940676]'
+          #keys: '[414996.1.211222420]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -34,13 +34,13 @@
     }
     Component MatrixEditorRows
     {
-      #keys: '[412672.1.61940677]'
+      #keys: '[414996.1.211222421]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorRows
         {
-          #keys: '[412672.1.61940678]'
+          #keys: '[414996.1.211222422]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -62,13 +62,13 @@
     }
     Component MatrixEditorColumns
     {
-      #keys: '[412672.1.61940679]'
+      #keys: '[414996.1.211222423]'
       BaseType: 'WebMatrixEditorHeaderLevel'
       Children:
       [
         Component DataExtractorColumns
         {
-          #keys: '[412672.1.61940680]'
+          #keys: '[414996.1.211222424]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -88,8 +88,8 @@
         Taborder: 2
       ]
     }
-    #child: matrixEditorActionBarPageDemandComparison_1
-    #child: matrixeditorContextMenuDemandComparison_1
+    #child: matrixEditorActionBarPageDemandComparison
+    #child: matrixeditorContextMenuDemandComparison
   ]
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison\043634.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison\043634.def"
deleted file mode 100644
index 4c2404e..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelDemandComparison\043634.def"
+++ /dev/null
@@ -1,119 +0,0 @@
-Quintiq file version 2.0
-Component PanelDemandComparison id:PanelDemandComparison_634
-{
-  #keys: '[412672.1.61940673]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: MatrixEditor_988
-    Component dhTable
-    {
-      #keys: '[412672.1.61940683]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'LocalTable'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component dhCheckedProducts
-    {
-      #keys: '[412672.1.61940684]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[Product_MP]*'
-      Children:
-      [
-        Component deCheckedProducts
-        {
-          #keys: '[412672.1.61940685]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[Product_MP]'
-            Source: 'ApplicationMacroPlanner.DataHolderCheckedProduct'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 4
-      ]
-    }
-    Component dhFinelProducts
-    {
-      #keys: '[412672.1.61940686]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[Product_MP]*'
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-    Component dhCheckedSalesSegments
-    {
-      #keys: '[412672.1.61940687]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[SalesSegment_MP]*'
-      Children:
-      [
-        Component deCheckedSalesSegments
-        {
-          #keys: '[412672.1.61940688]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[SalesSegment_MP]'
-            Source: 'ApplicationMacroPlanner.DataHolderCheckedSalesSegment'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 5
-      ]
-    }
-    Component dhCheckUnits id:dhCheckUnits_21
-    {
-      #keys: '[414996.1.137664654]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[Entity]*'
-      Children:
-      [
-        Component deCheckUnits id:deCheckUnits_368
-        {
-          #keys: '[414996.1.137664655]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[Entity]'
-            Source: 'ApplicationMacroPlanner.DataHolderCheckedEntities'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 6
-      ]
-    }
-    Component dhFinalUnits id:dhFinalUnits_90
-    {
-      #keys: '[414996.1.156002816]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[Entity]*'
-      Properties:
-      [
-        Taborder: 3
-      ]
-    }
-  ]
-  Properties:
-  [
-    Taborder: 2
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter.def
similarity index 78%
rename from "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter.def
index cd8db6b..8ebb830 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter\043119.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelFilter.def
@@ -1,13 +1,13 @@
 Quintiq file version 2.0
-Component PanelFilter id:PanelFilter_119
+Component PanelFilter
 {
-  #keys: '[412672.1.61991354]'
+  #keys: '[414996.1.211222324]'
   BaseType: 'WebPanel'
   Children:
   [
     Component ddslGeneration
     {
-      #keys: '[412672.1.61991355]'
+      #keys: '[414996.1.211222325]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -17,7 +17,7 @@
     }
     Component ddslMQBMLB
     {
-      #keys: '[412672.1.61991356]'
+      #keys: '[414996.1.211222326]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -27,7 +27,7 @@
     }
     Component ddslPower
     {
-      #keys: '[412672.1.61991357]'
+      #keys: '[414996.1.211222327]'
       BaseType: 'WebDropDownStringList'
       Properties:
       [
@@ -37,7 +37,7 @@
     }
     Component dsStartDate
     {
-      #keys: '[412672.1.61991358]'
+      #keys: '[414996.1.211222328]'
       BaseType: 'WebDateSelector'
       Properties:
       [
@@ -47,7 +47,7 @@
     }
     Component dsEndDate
     {
-      #keys: '[412672.1.61991359]'
+      #keys: '[414996.1.211222329]'
       BaseType: 'WebDateSelector'
       Properties:
       [
@@ -56,9 +56,9 @@
         Taborder: 5
       ]
     }
-    Component ButtonFilter
+    Component ButtonFilter458
     {
-      #keys: '[412672.1.61991360]'
+      #keys: '[414996.1.211222330]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -68,7 +68,7 @@
     }
     Component dhStartDate
     {
-      #keys: '[412672.1.61991361]'
+      #keys: '[414996.1.211222331]'
       BaseType: 'WebDataHolder'
       Databinding: 'Date*'
       Properties:
@@ -78,7 +78,7 @@
     }
     Component dhEndDate
     {
-      #keys: '[412672.1.61991362]'
+      #keys: '[414996.1.211222332]'
       BaseType: 'WebDataHolder'
       Databinding: 'Date*'
       Properties:
@@ -88,7 +88,7 @@
     }
     Component ButtonClearFilter
     {
-      #keys: '[414996.1.115030257]'
+      #keys: '[414996.1.211222333]'
       BaseType: 'WebButton'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon.def
deleted file mode 100644
index 0b978d9..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-Component PanelRibbon
-{
-  #keys: '[412672.1.64210439]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: PanelFilter_119
-    #child: PanelRibbon504
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504\043265.def"
similarity index 71%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504\043265.def"
index 39c2223..6a0c33e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon504\043265.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component PanelRibbon504
+Component PanelRibbon504 id:PanelRibbon504_265
 {
-  #keys: '[412672.1.64850929]'
+  #keys: '[414996.1.211222334]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component dhXMLDataListener id:dhXMLDataListener_273
+    Component dhXMLDataListener
     {
-      #keys: '[414996.1.108480431]'
+      #keys: '[414996.1.211222335]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[ExportXMLManager]*'
       Children:
       [
-        Component DataExtractor510 id:DataExtractor510_384
+        Component DataExtractor510
         {
-          #keys: '[414996.1.108480432]'
+          #keys: '[414996.1.211222336]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -33,7 +33,7 @@
     }
     Component dhTimeUnit
     {
-      #keys: '[414996.1.147730603]'
+      #keys: '[414996.1.211222337]'
       BaseType: 'WebDataHolder'
       Databinding: 'String*'
       Properties:
@@ -41,7 +41,7 @@
         Taborder: 1
       ]
     }
-    #child: PanelRibbon763
+    #child: PanelRibbon763_184
   ]
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763\043184.def"
similarity index 74%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def
rename to "_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763\043184.def"
index 4e60ae5..89cef3f 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763.def
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_PanelRibbon763\043184.def"
@@ -1,20 +1,20 @@
 Quintiq file version 2.0
-Component PanelRibbon763
+Component PanelRibbon763 id:PanelRibbon763_184
 {
-  #keys: '[414996.1.148040406]'
+  #keys: '[414996.1.211222338]'
   BaseType: 'WebPanel'
   Children:
   [
-    Component ddlOfflinePlanTable id:ddlOfflinePlanTable_217
+    Component ddlOfflinePlanTable
     {
-      #keys: '[414996.1.148040527]'
+      #keys: '[414996.1.211222339]'
       BaseType: 'WebDropDownList'
       Databinding: 'OfflinePlanTableInfo'
       Children:
       [
-        Component DataExtractorRibbon id:DataExtractorRibbon_568
+        Component DataExtractorRibbon
         {
-          #keys: '[414996.1.148040528]'
+          #keys: '[414996.1.211222340]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -33,9 +33,9 @@
         Taborder: 0
       ]
     }
-    Component bComparison id:bComparison_136
+    Component bComparison
     {
-      #keys: '[414996.1.148040554]'
+      #keys: '[414996.1.211222341]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -45,7 +45,7 @@
     }
     Component bExport
     {
-      #keys: '[414996.1.148040586]'
+      #keys: '[414996.1.211222342]'
       BaseType: 'WebButton'
       Properties:
       [
@@ -55,7 +55,7 @@
     }
     Component rbgTimeUnit
     {
-      #keys: '[414996.1.158400570]'
+      #keys: '[414996.1.211222343]'
       BaseType: 'WebRadioButtonGroup'
       Properties:
       [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def
new file mode 100644
index 0000000..2117e88
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage206.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage206
+{
+  #keys: '[414996.1.211222183]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245\0431.def"
deleted file mode 100644
index 711c816..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage245\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage245 id:listActionBarPage245_1
-{
-  #keys: '[414996.1.191962672]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519\0431.def"
deleted file mode 100644
index fd9b676..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage519\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage519 id:listActionBarPage519_1
-{
-  #keys: '[414996.1.191962681]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
new file mode 100644
index 0000000..eb6b6c9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage690.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage690
+{
+  #keys: '[414996.1.211222174]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
new file mode 100644
index 0000000..d288e9c
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage703.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listActionBarPage703
+{
+  #keys: '[414996.1.211222165]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963\0431.def"
deleted file mode 100644
index 75ebb0b..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listActionBarPage963\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listActionBarPage963 id:listActionBarPage963_1
-{
-  #keys: '[414996.1.191962663]'
-  BaseType: 'listActionBarPage'
-  Properties:
-  [
-    Taborder: 1
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
new file mode 100644
index 0000000..14c3c4d
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu245.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu245
+{
+  #keys: '[414996.1.211222167]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319\0431.def"
deleted file mode 100644
index 37001bd..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu319\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu319 id:listContextMenu319_1
-{
-  #keys: '[414996.1.191962683]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623\0431.def"
deleted file mode 100644
index 2529df2..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu623\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu623 id:listContextMenu623_1
-{
-  #keys: '[414996.1.191962674]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687\0431.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687\0431.def"
deleted file mode 100644
index bb0a0af..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu687\0431.def"
+++ /dev/null
@@ -1,10 +0,0 @@
-Quintiq file version 2.0
-Component listContextMenu687 id:listContextMenu687_1
-{
-  #keys: '[414996.1.191962665]'
-  BaseType: 'listContextMenu'
-  Properties:
-  [
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def
new file mode 100644
index 0000000..43d83d5
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu936.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu936
+{
+  #keys: '[414996.1.211222185]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def
new file mode 100644
index 0000000..4fe59a9
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_listContextMenu979.def
@@ -0,0 +1,10 @@
+Quintiq file version 2.0
+Component listContextMenu979
+{
+  #keys: '[414996.1.211222176]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixEditorActionBarPageDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison.def
similarity index 83%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixEditorActionBarPageDemandComparison.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison.def
index 8c6fa9a..309880b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_matrixEditorActionBarPageDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixEditorActionBarPageDemandComparison.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component matrixEditorActionBarPageDemandComparison
 {
-  #keys: '[412672.1.78210539]'
+  #keys: '[414996.1.211222425]'
   BaseType: 'matrixEditorActionBarPage'
   Properties:
   [
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixeditorContextMenuDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixeditorContextMenuDemandComparison.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison.def
index 1b6282c..67576cb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_matrixeditorContextMenuDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_matrixeditorContextMenuDemandComparison.def
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 Component matrixeditorContextMenuDemandComparison
 {
-  #keys: '[412672.0.1085881212]'
+  #keys: '[414996.1.211222426]'
   BaseType: 'matrixeditorContextMenu'
   Properties:
   [
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration\043100.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration\043100.def"
deleted file mode 100644
index bde70d9..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration\043100.def"
+++ /dev/null
@@ -1,52 +0,0 @@
-Quintiq file version 2.0
-Component pGeneration id:pGeneration_100
-{
-  #keys: '[414996.1.191962660]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: ListGenerations_61
-    Component dhGenerations
-    {
-      #keys: '[414996.1.191962666]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component dhCheckGenerations
-    {
-      #keys: '[414996.1.191962667]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Children:
-      [
-        Component deCheckGenerations
-        {
-          #keys: '[414996.1.191962668]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[LocalValue]'
-            FixedFilter: 'object.IsCheck()'
-            Source: 'dhGenerations'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    MinimumRows: 20
-    Taborder: 0
-    Title: 'Generation'
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
similarity index 67%
copy from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
index 397397e..6bcde59 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pGeneration\043100.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pGeneration208.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pGeneration id:pGeneration_100
+Component pGeneration208
 {
-  #keys: '[414996.1.191962760]'
+  #keys: '[414996.1.211222179]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListGenerations_61
-    Component dhGenerations
+    Component dhGenerations423
     {
-      #keys: '[414996.1.191962766]'
+      #keys: '[414996.1.211222180]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,22 +15,23 @@
         Taborder: 1
       ]
     }
-    Component dhCheckGenerations
+    #child: ListGenerations366
+    Component dhCheckGenerations744
     {
-      #keys: '[414996.1.191962767]'
+      #keys: '[414996.1.211222186]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckGenerations
+        Component deCheckGenerations857
         {
-          #keys: '[414996.1.191962768]'
+          #keys: '[414996.1.211222187]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhGenerations'
+            Source: 'dhGenerations423'
             Taborder: 0
             Transformation: 'Elements'
           ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB\043653.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB\043653.def"
deleted file mode 100644
index c74229c..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB\043653.def"
+++ /dev/null
@@ -1,52 +0,0 @@
-Quintiq file version 2.0
-Component pMQBMLB id:pMQBMLB_653
-{
-  #keys: '[414996.1.191962678]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: ListMQBMLB_670
-    Component dhMQBMLB
-    {
-      #keys: '[414996.1.191962684]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component dhCheckMQBMLB
-    {
-      #keys: '[414996.1.191962685]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Children:
-      [
-        Component deCheckMQBMLB
-        {
-          #keys: '[414996.1.191962686]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[LocalValue]'
-            FixedFilter: 'object.IsCheck()'
-            Source: 'dhMQBMLB'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    MinimumRows: 20
-    Taborder: 2
-    Title: 'MQB/MLB'
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB\043653.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def
similarity index 69%
copy from "_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB\043653.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def
index 9e50a4f..eaf5fed 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Component_pMQBMLB\043653.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMQBMLB154.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pMQBMLB id:pMQBMLB_653
+Component pMQBMLB154
 {
-  #keys: '[414996.1.192703115]'
+  #keys: '[414996.1.211222161]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListMQBMLB_670
-    Component dhMQBMLB
+    Component dhMQBMLB972
     {
-      #keys: '[414996.1.192703121]'
+      #keys: '[414996.1.211222162]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,22 +15,23 @@
         Taborder: 1
       ]
     }
-    Component dhCheckMQBMLB
+    #child: ListMQBMLB700
+    Component dhCheckMQBMLB319
     {
-      #keys: '[414996.1.192703122]'
+      #keys: '[414996.1.211222168]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckMQBMLB
+        Component deCheckMQBMLB661
         {
-          #keys: '[414996.1.192703123]'
+          #keys: '[414996.1.211222169]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhMQBMLB'
+            Source: 'dhMQBMLB972'
             Taborder: 0
             Transformation: 'Elements'
           ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
new file mode 100644
index 0000000..592611f
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainLeft\043545.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainLeft id:pMainLeft_545
+{
+  #keys: '[414996.1.211222159]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pProductAttributeFilter189
+  ]
+  Properties:
+  [
+    FixedSize: true
+    MinimumColumns: 40
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainPanel\043549.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainPanel\043549.def"
new file mode 100644
index 0000000..7d7da1c
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainPanel\043549.def"
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pMainPanel id:pMainPanel_549
+{
+  #keys: '[414996.1.211222121]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMainRight_593
+    #child: pMainLeft_545
+  ]
+  Properties:
+  [
+    Orientation: 'horizontal'
+    Taborder: 0
+  ]
+}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainRight\043593.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainRight\043593.def"
new file mode 100644
index 0000000..8af9c75
--- /dev/null
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pMainRight\043593.def"
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+Component pMainRight id:pMainRight_593
+{
+  #keys: '[414996.1.211222122]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pRibbon
+    #child: pOfflinePlanComparison
+  ]
+  Properties:
+  [
+    Taborder: 1
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelDemandComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pOfflinePlanComparison.def
similarity index 83%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelDemandComparison.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pOfflinePlanComparison.def
index 3f5965c..2788026 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_PanelDemandComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pOfflinePlanComparison.def
@@ -1,13 +1,14 @@
 Quintiq file version 2.0
-Component PanelDemandComparison
+Component pOfflinePlanComparison
 {
-  #keys: '[412672.1.78210531]'
+  #keys: '[414996.1.211222417]'
   BaseType: 'WebPanel'
   Children:
   [
+    #child: MatrixEditor
     Component dhTable
     {
-      #keys: '[412672.1.78210541]'
+      #keys: '[414996.1.211222427]'
       BaseType: 'WebDataHolder'
       Databinding: 'LocalTable'
       Properties:
@@ -17,14 +18,14 @@
     }
     Component dhCheckedProducts
     {
-      #keys: '[412672.1.78210542]'
+      #keys: '[414996.1.211222428]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Children:
       [
         Component deCheckedProducts
         {
-          #keys: '[412672.1.78210543]'
+          #keys: '[414996.1.211222429]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -42,7 +43,7 @@
     }
     Component dhFinelProducts
     {
-      #keys: '[412672.1.78210544]'
+      #keys: '[414996.1.211222430]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Product_MP]*'
       Properties:
@@ -52,14 +53,14 @@
     }
     Component dhCheckedSalesSegments
     {
-      #keys: '[412672.1.78210545]'
+      #keys: '[414996.1.211222431]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[SalesSegment_MP]*'
       Children:
       [
         Component deCheckedSalesSegments
         {
-          #keys: '[412672.1.78210546]'
+          #keys: '[414996.1.211222432]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -75,17 +76,16 @@
         Taborder: 5
       ]
     }
-    #child: MatrixEditor
     Component dhCheckUnits
     {
-      #keys: '[414996.1.137664350]'
+      #keys: '[414996.1.211222433]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Children:
       [
         Component deCheckUnits
         {
-          #keys: '[414996.1.137664394]'
+          #keys: '[414996.1.211222434]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
@@ -103,7 +103,7 @@
     }
     Component dhFinalUnits
     {
-      #keys: '[414996.1.156002469]'
+      #keys: '[414996.1.211222435]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[Entity]*'
       Properties:
@@ -114,6 +114,6 @@
   ]
   Properties:
   [
-    Taborder: 2
+    Taborder: 1
   ]
 }
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower\043969.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower\043969.def"
deleted file mode 100644
index b8bfbfa..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower\043969.def"
+++ /dev/null
@@ -1,52 +0,0 @@
-Quintiq file version 2.0
-Component pPower id:pPower_969
-{
-  #keys: '[414996.1.191962669]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: ListPowers_667
-    Component dhPowers
-    {
-      #keys: '[414996.1.191962675]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Properties:
-      [
-        Taborder: 1
-      ]
-    }
-    Component dhCheckPowers
-    {
-      #keys: '[414996.1.191962676]'
-      BaseType: 'WebDataHolder'
-      Databinding: 'structured[LocalValue]*'
-      Children:
-      [
-        Component deCheckPowers
-        {
-          #keys: '[414996.1.191962677]'
-          BaseType: 'WebDataExtractor'
-          Properties:
-          [
-            DataType: 'structured[LocalValue]'
-            FixedFilter: 'object.IsCheck()'
-            Source: 'dhPowers'
-            Taborder: 0
-            Transformation: 'Elements'
-          ]
-        }
-      ]
-      Properties:
-      [
-        Taborder: 2
-      ]
-    }
-  ]
-  Properties:
-  [
-    MinimumRows: 20
-    Taborder: 1
-    Title: 'Power'
-  ]
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def" b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
similarity index 69%
copy from "_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def"
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
index bd0332c..4c8ef19 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_Form701/Component_pPower\043969.def"
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pPower243.def
@@ -1,14 +1,13 @@
 Quintiq file version 2.0
-Component pPower id:pPower_969
+Component pPower243
 {
-  #keys: '[414996.1.191962769]'
+  #keys: '[414996.1.211222170]'
   BaseType: 'WebPanel'
   Children:
   [
-    #child: ListPowers_667
-    Component dhPowers
+    Component dhPowers404
     {
-      #keys: '[414996.1.191962775]'
+      #keys: '[414996.1.211222171]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Properties:
@@ -16,22 +15,23 @@
         Taborder: 1
       ]
     }
-    Component dhCheckPowers
+    #child: ListPowers199
+    Component dhCheckPowers354
     {
-      #keys: '[414996.1.191962776]'
+      #keys: '[414996.1.211222177]'
       BaseType: 'WebDataHolder'
       Databinding: 'structured[LocalValue]*'
       Children:
       [
-        Component deCheckPowers
+        Component deCheckPowers981
         {
-          #keys: '[414996.1.191962777]'
+          #keys: '[414996.1.211222178]'
           BaseType: 'WebDataExtractor'
           Properties:
           [
             DataType: 'structured[LocalValue]'
             FixedFilter: 'object.IsCheck()'
-            Source: 'dhPowers'
+            Source: 'dhPowers404'
             Taborder: 0
             Transformation: 'Elements'
           ]
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter\043697.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter\043697.def"
deleted file mode 100644
index 6414f61..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter\043697.def"
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-Component pProductAttributeFilter id:pProductAttributeFilter_697
-{
-  #keys: '[414996.1.191962659]'
-  BaseType: 'WebPanel'
-  Children:
-  [
-    #child: pGeneration_100
-    #child: pPower_969
-    #child: pMQBMLB_653
-  ]
-  Properties:
-  [
-    FixedSize: true
-    Orientation: 'horizontal'
-    Taborder: 0
-  ]
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def
new file mode 100644
index 0000000..21aa3d2
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pProductAttributeFilter189.def
@@ -0,0 +1,17 @@
+Quintiq file version 2.0
+Component pProductAttributeFilter189
+{
+  #keys: '[414996.1.211222160]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: pMQBMLB154
+    #child: pPower243
+    #child: pGeneration208
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pRibbon.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pRibbon.def
new file mode 100644
index 0000000..b4a62a7
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Component_pRibbon.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+Component pRibbon
+{
+  #keys: '[414996.1.211222323]'
+  BaseType: 'WebPanel'
+  Children:
+  [
+    #child: PanelFilter
+    #child: PanelRibbon504_265
+  ]
+  Properties:
+  [
+    FixedSize: true
+    Taborder: 0
+  ]
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_61_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_61_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def
index 0022821..092ea75 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_ListGenerations_61_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations366_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListGenerations_61
+#parent: ListGenerations366
 Response OnClick (
   LocalValue selection
-) id:Response_ListGenerations_61_OnClick
+) id:Response_ListGenerations366_OnClick
 {
-  #keys: '[414996.1.197722723]'
+  #keys: '[414996.1.211222095]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_61_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_61_OnClick.def
deleted file mode 100644
index 46e2683..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListGenerations_61_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListGenerations_61
-Response OnClick (
-  LocalValue selection
-) id:Response_ListGenerations_61_OnClick
-{
-  #keys: '[414996.1.197722673]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
index 242d357..f3b51c6 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB700_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListMQBMLB700
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListMQBMLB700_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211222103]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def
index 242d357..d999ea9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListMQBMLB_670_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers199_OnClick.def
@@ -1,10 +1,10 @@
 Quintiq file version 2.0
-#parent: ListMQBMLB_670
+#parent: ListPowers199
 Response OnClick (
   LocalValue selection
-) id:Response_ListMQBMLB_670_OnClick
+) id:Response_ListPowers199_OnClick
 {
-  #keys: '[414996.1.197722695]'
+  #keys: '[414996.1.211222099]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebList_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_667_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_667_OnClick.def
deleted file mode 100644
index 1e49feb..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_ListPowers_667_OnClick.def
+++ /dev/null
@@ -1,18 +0,0 @@
-Quintiq file version 2.0
-#parent: ListPowers_667
-Response OnClick (
-  LocalValue selection
-) id:Response_ListPowers_667_OnClick
-{
-  #keys: '[414996.1.197722684]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebList_OnClick'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      selection.IsCheck( not selection.IsCheck() );
-    *]
-  }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckUnits_OnDataChanged\043832.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckUnits_OnDataChanged\043832.def"
deleted file mode 100644
index 0617ec7..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckUnits_OnDataChanged\043832.def"
+++ /dev/null
@@ -1,21 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison_634/dhCheckUnits_21
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckUnits_OnDataChanged_832
-{
-  #keys: '[414996.1.137664652]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      if( this.Data().Size() <> 0 ){
-        units := selectset( dhFinalUnits.Data(),Elements,element,exists( this.Data(),Elements,entity,entity = element ));
-        dhFinalUnits.Data( &units );
-      }else{
-        dhFinalUnits.Data( DataHolderEntities.Data().Copy() );
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckedProducts_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckedProducts_OnDataChanged.def
deleted file mode 100644
index 4789bfe..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckedProducts_OnDataChanged.def
+++ /dev/null
@@ -1,20 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison_634/dhCheckedProducts
-Response OnDataChanged () id:Response_PanelDemandComparison_634_dhCheckedProducts_OnDataChanged
-{
-  #keys: '[412672.1.61940669]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      if( this.Data().Size() <> 0 ){
-        dhFinelProducts.Data( this.Data().Copy() ); 
-      }else{
-        dhFinelProducts.Data( DataHolderProduct.Data().Copy() ); 
-      }
-    *]
-  }
-}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhFinalUnits_OnCreated\043540.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhFinalUnits_OnCreated\043540.def"
deleted file mode 100644
index 78acb84..0000000
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhFinalUnits_OnCreated\043540.def"
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison_634/dhFinalUnits_90
-Response OnCreated () id:Response_PanelDemandComparison_dhFinalUnits_OnCreated_540
-{
-  #keys: '[414996.1.156002814]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      dhFinalUnits.Data( DataHolderEntities.Data().Copy() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhFinelProducts_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhFinelProducts_OnCreated.def
deleted file mode 100644
index 8c962e7..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhFinelProducts_OnCreated.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison_634/dhFinelProducts
-Response OnCreated () id:Response_PanelDemandComparison_634_dhFinelProducts_OnCreated
-{
-  #keys: '[412672.1.61940668]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnCreated'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      this.Data( DataHolderProduct.Data().Copy() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhTable_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhTable_OnDataChanged.def
deleted file mode 100644
index 5d0c78b..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhTable_OnDataChanged.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: PanelDemandComparison_634/dhTable
-Response OnDataChanged () id:Response_PanelDemandComparison_634_dhTable_OnDataChanged
-{
-  #keys: '[412672.1.61940670]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      PanelDemandComparison.Title( this.Data().Name() );
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonClearFilter_OnClick.def
similarity index 69%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonClearFilter_OnClick.def
index a93ecd4..127be2b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonClearFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonClearFilter_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ButtonClearFilter
-Response OnClick () id:Response_PanelFilter_119_ButtonClearFilter_OnClick
+#parent: PanelFilter/ButtonClearFilter
+Response OnClick () id:Response_PanelFilter_ButtonClearFilter_OnClick
 {
-  #keys: '[414996.1.115030293]'
+  #keys: '[414996.1.211222311]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonFilter458_OnClick.def
similarity index 83%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonFilter458_OnClick.def
index 01398db..5818724 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_119_ButtonFilter_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ButtonFilter458_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelFilter_119/ButtonFilter
-Response OnClick () id:Response_PanelFilter_119_ButtonFilter_OnClick
+#parent: PanelFilter/ButtonFilter458
+Response OnClick () id:Response_PanelFilter_ButtonFilter458_OnClick
 {
-  #keys: '[412672.1.61991348]'
+  #keys: '[414996.1.211222314]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslGeneration_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslGeneration_OnCreated.def
similarity index 93%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslGeneration_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslGeneration_OnCreated.def
index 479534f..4278438 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslGeneration_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslGeneration_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: PanelFilter/ddslGeneration
 Response OnCreated () id:Response_PanelFilter_ddslGeneration_OnCreated
 {
-  #keys: '[412672.1.78210462]'
+  #keys: '[414996.1.211222319]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslMQBMLB_OnCreated.def
similarity index 93%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslMQBMLB_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslMQBMLB_OnCreated.def
index 9d78957..58a2b61 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslMQBMLB_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: PanelFilter/ddslMQBMLB
 Response OnCreated () id:Response_PanelFilter_ddslMQBMLB_OnCreated
 {
-  #keys: '[412672.1.78210461]'
+  #keys: '[414996.1.211222318]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslPower_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslPower_OnCreated.def
similarity index 93%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslPower_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslPower_OnCreated.def
index a610d7d..74838c2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_ddslPower_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_ddslPower_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: PanelFilter/ddslPower
 Response OnCreated () id:Response_PanelFilter_ddslPower_OnCreated
 {
-  #keys: '[412672.1.78210460]'
+  #keys: '[414996.1.211222317]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dhEndDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhEndDate_OnCreated.def
similarity index 90%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dhEndDate_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhEndDate_OnCreated.def
index ab03d32..644ff6e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dhEndDate_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhEndDate_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: PanelFilter/dhEndDate
 Response OnCreated () id:Response_PanelFilter_dhEndDate_OnCreated
 {
-  #keys: '[412672.1.78210455]'
+  #keys: '[414996.1.211222312]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dhStartDate_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhStartDate_OnCreated.def
similarity index 90%
rename from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dhStartDate_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhStartDate_OnCreated.def
index d80fb7d..a5d030c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_PanelFilter_dhStartDate_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dhStartDate_OnCreated.def
@@ -2,7 +2,7 @@
 #parent: PanelFilter/dhStartDate
 Response OnCreated () id:Response_PanelFilter_dhStartDate_OnCreated
 {
-  #keys: '[412672.0.1122841156]'
+  #keys: '[414996.1.211222313]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dsEndDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsEndDate_OnChanged.def
similarity index 90%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dsEndDate_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsEndDate_OnChanged.def
index dd8a509..19407ce 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dsEndDate_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsEndDate_OnChanged.def
@@ -2,7 +2,7 @@
 #parent: PanelFilter/dsEndDate
 Response OnChanged () id:Response_PanelFilter_dsEndDate_OnChanged
 {
-  #keys: '[412672.1.78210458]'
+  #keys: '[414996.1.211222315]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dsStartDate_OnChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsStartDate_OnChanged.def
similarity index 90%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dsStartDate_OnChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsStartDate_OnChanged.def
index fefafb6..8779345 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelFilter_dsStartDate_OnChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelFilter_dsStartDate_OnChanged.def
@@ -2,7 +2,7 @@
 #parent: PanelFilter/dsStartDate
 Response OnChanged () id:Response_PanelFilter_dsStartDate_OnChanged
 {
-  #keys: '[412672.1.78210459]'
+  #keys: '[414996.1.211222316]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebDateTimeFieldBase_OnChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhTimeUnit_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhTimeUnit_OnCreated.def
similarity index 61%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhTimeUnit_OnCreated.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhTimeUnit_OnCreated.def
index 8407403..3f7bb02 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhTimeUnit_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhTimeUnit_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon504/dhTimeUnit
-Response OnCreated () id:Response_PanelRibbon504_801_dhTimeUnit_OnCreated
+#parent: PanelRibbon504_265/dhTimeUnit
+Response OnCreated () id:Response_PanelRibbon504_265_dhTimeUnit_OnCreated
 {
-  #keys: '[414996.1.147730601]'
+  #keys: '[414996.1.211222309]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhXMLDataListener_OnDataChanged.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhXMLDataListener_OnDataChanged.def
index 3bcabcb..6ea7436 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_dhXMLDataListener_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon504_265_dhXMLDataListener_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon504/dhXMLDataListener_273
-Response OnDataChanged () id:Response_PanelRibbon504_dhXMLDataListener_OnDataChanged
+#parent: PanelRibbon504_265/dhXMLDataListener
+Response OnDataChanged () id:Response_PanelRibbon504_265_dhXMLDataListener_OnDataChanged
 {
-  #keys: '[414996.1.106110528]'
+  #keys: '[414996.1.211222310]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_bComparison_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bComparison_OnClick.def
similarity index 77%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_bComparison_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bComparison_OnClick.def
index 8211a83..dbde14d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_bComparison_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bComparison_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon763/bComparison_136
-Response OnClick () id:Response_PanelRibbon504_bComparison_OnClick
+#parent: PanelRibbon763_184/bComparison
+Response OnClick () id:Response_PanelRibbon763_184_bComparison_OnClick
 {
-  #keys: '[414996.1.148040553]'
+  #keys: '[414996.1.211222322]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_bExport_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bExport_OnClick.def
similarity index 80%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_bExport_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bExport_OnClick.def
index 44fb526..b33f8ac 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_bExport_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_bExport_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon763/bExport
-Response OnClick () id:Response_PanelRibbon504_bExport_OnClick
+#parent: PanelRibbon763_184/bExport
+Response OnClick () id:Response_PanelRibbon763_184_bExport_OnClick
 {
-  #keys: '[414996.1.148040585]'
+  #keys: '[414996.1.211222321]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_rbgTimeUnit_OnUserChanged.def
similarity index 60%
copy from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_rbgTimeUnit_OnUserChanged.def
index 2ce7f7e..27c02f1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_rbgTimeUnit_OnUserChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelRibbon763_184_rbgTimeUnit_OnUserChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRibbon763/rbgTimeUnit
-Response OnUserChanged () id:Response_PanelRibbon510_rbgTimeUnit_OnUserChanged
+#parent: PanelRibbon763_184/rbgTimeUnit
+Response OnUserChanged () id:Response_PanelRibbon763_184_rbgTimeUnit_OnUserChanged
 {
-  #keys: '[414996.1.158400569]'
+  #keys: '[414996.1.211222320]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebRadioButtonGroup_OnUserChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def
similarity index 79%
copy from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def
index 416291b..fe5a791 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhCheckGenerations744_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration_100/dhCheckGenerations
-Response OnDataChanged () id:Response_pGeneration_100_dhCheckGenerations_OnDataChanged
+#parent: pGeneration208/dhCheckGenerations744
+Response OnDataChanged () id:Response_pGeneration208_dhCheckGenerations744_OnDataChanged
 {
-  #keys: '[414996.1.192703090]'
+  #keys: '[414996.1.211222094]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_100_dhGenerations_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def
similarity index 67%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_100_dhGenerations_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def
index 92ca4eb..75ffbd9 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_100_dhGenerations_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration208_dhGenerations423_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pGeneration_100/dhGenerations
-Response OnCreated () id:Response_pGeneration_100_dhGenerations_OnCreated
+#parent: pGeneration208/dhGenerations423
+Response OnCreated () id:Response_pGeneration208_dhGenerations423_OnCreated
 {
-  #keys: '[414996.1.191962654]'
+  #keys: '[414996.1.211222097]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
deleted file mode 100644
index 1ceb281..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pGeneration_100_dhCheckGenerations_OnDataChanged.def
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-#parent: pGeneration_100/dhCheckGenerations
-Response OnDataChanged () id:Response_pGeneration_100_dhCheckGenerations_OnDataChanged
-{
-  #keys: '[414996.1.191962653]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      products := dhFinelProducts.Data();
-      if( this.Data().Size() <> 0 ){
-        products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Generation()));
-        dhFinelProducts.Data( &products );
-      }else{
-        if( dhCheckedProducts.Data().Size() <> 0 ){
-          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
-        }else{
-          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
-        }
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def
similarity index 81%
copy from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def
index 0aaeb78..9a6cc0c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB_653/dhCheckMQBMLB
-Response OnDataChanged () id:Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged
+#parent: pMQBMLB154/dhCheckMQBMLB319
+Response OnDataChanged () id:Response_pMQBMLB154_dhCheckMQBMLB319_OnDataChanged
 {
-  #keys: '[414996.1.192703084]'
+  #keys: '[414996.1.211222102]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def
index a27ba5e..de14fb0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_653_dhMQBMLB_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB154_dhMQBMLB972_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pMQBMLB_653/dhMQBMLB
-Response OnCreated () id:Response_pMQBMLB_653_dhMQBMLB_OnCreated
+#parent: pMQBMLB154/dhMQBMLB972
+Response OnCreated () id:Response_pMQBMLB154_dhMQBMLB972_OnCreated
 {
-  #keys: '[414996.1.191962648]'
+  #keys: '[414996.1.211222105]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
deleted file mode 100644
index 00e3a73..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged.def
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-#parent: pMQBMLB_653/dhCheckMQBMLB
-Response OnDataChanged () id:Response_pMQBMLB_653_dhCheckMQBMLB_OnDataChanged
-{
-  #keys: '[414996.1.191962647]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      products := dhFinelProducts.Data();
-      if( this.Data().Size() <> 0 ){
-        products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.MQBMLB()));
-        dhFinelProducts.Data( &products );
-      }else{
-        if( dhCheckedProducts.Data().Size() <> 0 ){ 
-          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
-        }else{
-          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
-        }
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckUnits_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckUnits_OnDataChanged.def
similarity index 73%
copy from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckUnits_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckUnits_OnDataChanged.def
index ccb29d2..9feba3b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckUnits_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckUnits_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhCheckUnits
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckUnits_OnDataChanged
+#parent: pOfflinePlanComparison/dhCheckUnits
+Response OnDataChanged () id:Response_pOfflinePlanComparison_dhCheckUnits_OnDataChanged
 {
-  #keys: '[414996.1.137664549]'
+  #keys: '[414996.1.211222410]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedProducts_OnDataChanged.def
similarity index 67%
copy from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedProducts_OnDataChanged.def
index 9246aad..887fca7 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedProducts_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhCheckedProducts
-Response OnDataChanged () id:Response_PanelDemandComparison_dhCheckedProducts_OnDataChanged
+#parent: pOfflinePlanComparison/dhCheckedProducts
+Response OnDataChanged () id:Response_pOfflinePlanComparison_dhCheckedProducts_OnDataChanged
 {
-  #keys: '[412672.1.78210527]'
+  #keys: '[414996.1.211222413]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckedSalesSegments_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedSalesSegments_OnDataChanged.def
similarity index 72%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckedSalesSegments_OnDataChanged.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedSalesSegments_OnDataChanged.def
index 3346eba..1bd65e5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_PanelDemandComparison_634_dhCheckedSalesSegments_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhCheckedSalesSegments_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison_634/dhCheckedSalesSegments
-Response OnDataChanged () id:Response_PanelDemandComparison_634_dhCheckedSalesSegments_OnDataChanged
+#parent: pOfflinePlanComparison/dhCheckedSalesSegments
+Response OnDataChanged () id:Response_pOfflinePlanComparison_dhCheckedSalesSegments_OnDataChanged
 {
-  #keys: '[412672.1.61940667]'
+  #keys: '[414996.1.211222411]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinalUnits_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinalUnits_OnCreated.def
similarity index 60%
rename from _Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinalUnits_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinalUnits_OnCreated.def
index 7775cdb..95a7dca 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_Form701/Response_PanelDemandComparison_dhFinalUnits_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinalUnits_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelDemandComparison/dhFinalUnits
-Response OnCreated () id:Response_PanelDemandComparison_dhFinalUnits_OnCreated
+#parent: pOfflinePlanComparison/dhFinalUnits
+Response OnCreated () id:Response_pOfflinePlanComparison_dhFinalUnits_OnCreated
 {
-  #keys: '[414996.1.156002689]'
+  #keys: '[414996.1.211222409]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinelProducts_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinelProducts_OnCreated.def
new file mode 100644
index 0000000..cb355aa
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhFinelProducts_OnCreated.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pOfflinePlanComparison/dhFinelProducts
+Response OnCreated () id:Response_pOfflinePlanComparison_dhFinelProducts_OnCreated
+{
+  #keys: '[414996.1.211222412]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnCreated'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      this.Data( DataHolderProduct.Data().Copy() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhTable_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhTable_OnDataChanged.def
new file mode 100644
index 0000000..207b704
--- /dev/null
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pOfflinePlanComparison_dhTable_OnDataChanged.def
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: pOfflinePlanComparison/dhTable
+Response OnDataChanged () id:Response_pOfflinePlanComparison_dhTable_OnDataChanged
+{
+  #keys: '[414996.1.211222414]'
+  CanBindMultiple: false
+  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
+  GroupServerCalls: true
+  QuillAction
+  {
+    Body:
+    [*
+      pOfflinePlanComparison.Title( this.Data().Name() );
+    *]
+  }
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def
similarity index 81%
copy from _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
copy to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def
index c8fa6c5..6350ea0 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhCheckPowers354_OnDataChanged.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower_969/dhCheckPowers
-Response OnDataChanged () id:Response_pPower_969_dhCheckPowers_OnDataChanged
+#parent: pPower243/dhCheckPowers354
+Response OnDataChanged () id:Response_pPower243_dhCheckPowers354_OnDataChanged
 {
-  #keys: '[414996.1.192703087]'
+  #keys: '[414996.1.211222098]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
   GroupServerCalls: true
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_969_dhPowers_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def
similarity index 70%
rename from _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_969_dhPowers_OnCreated.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def
index b9ee84e..666ed84 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_969_dhPowers_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower243_dhPowers404_OnCreated.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: pPower_969/dhPowers
-Response OnCreated () id:Response_pPower_969_dhPowers_OnCreated
+#parent: pPower243/dhPowers404
+Response OnCreated () id:Response_pPower243_dhPowers404_OnCreated
 {
-  #keys: '[414996.1.191962651]'
+  #keys: '[414996.1.211222101]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebComponent_OnCreated'
   QuillAction
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
deleted file mode 100644
index ba7391b..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/Response_pPower_969_dhCheckPowers_OnDataChanged.def
+++ /dev/null
@@ -1,26 +0,0 @@
-Quintiq file version 2.0
-#parent: pPower_969/dhCheckPowers
-Response OnDataChanged () id:Response_pPower_969_dhCheckPowers_OnDataChanged
-{
-  #keys: '[414996.1.191962650]'
-  CanBindMultiple: false
-  DefinitionID: 'Responsedef_WebComponent_OnDataChanged'
-  GroupServerCalls: true
-  QuillAction
-  {
-    Body:
-    [*
-      products := dhFinelProducts.Data();
-      if( this.Data().Size() <> 0 ){
-        products := selectset( products,Elements,product,exists( this.Data(),Elements,element,element.StringValue() = product.Power()));
-        dhFinelProducts.Data( &products );
-      }else{
-        if( dhCheckedProducts.Data().Size() <> 0 ){
-          dhFinelProducts.Data( dhCheckedProducts.Data().Copy() );
-        }else{
-          dhFinelProducts.Data( DataHolderProduct.Data().Copy() );
-        }
-      }
-    *]
-  }
-}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/_ROOT_Component_FormOfflinePlanComparison.def b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/_ROOT_Component_FormOfflinePlanComparison.def
index 08fa29b..7e4d54c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/_ROOT_Component_FormOfflinePlanComparison.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanComparison/_ROOT_Component_FormOfflinePlanComparison.def
@@ -7,9 +7,7 @@
   BaseType: 'WebForm'
   Children:
   [
-    #child: PanelRibbon
-    #child: PanelDemandComparison_634
-    #child: pProductAttributeFilter_697
+    #child: pMainPanel_549
   ]
   Properties:
   [

--
Gitblit v1.9.3