Overview nits

Some nits from recent Overview updates:
* compiler error using 'and' instead of '&&', gcc happy, msvc not.
* kpi overview item default set to CP estimate
* add chart wizard formatting of final page.

src/Charts/OverviewItems.cpp

@@ -366,7 +366,7 @@ KPIOverviewItem::setData(RideItem *item)
     value=Utils::removeDP(value);
 
     // now set the progressbar
-    if (start == 0 and stop == 0) progressbar->hide();
+    if (start == 0 && stop == 0) progressbar->hide();
     else {
         progressbar->show();
         progressbar->setValue(start, stop, value.toDouble());

src/Charts/OverviewItems.h

@@ -106,7 +106,7 @@ class KPIOverviewItem : public ChartSpaceItem
         QWidget *config() { return new OverviewItemConfig(this); }
 
         // create and config
-        static ChartSpaceItem *create(ChartSpace *parent) { return new KPIOverviewItem(parent, "CP", 0, 261, "{ 200; }", "watts"); }
+        static ChartSpaceItem *create(ChartSpace *parent) { return new KPIOverviewItem(parent, "CP Estimate", 0, 360, "{ round(estimate(cp3,cp)); }", "watts"); }
 
         // settings
         double start, stop;

src/Gui/AddChartWizard.cpp

@@ -160,6 +160,8 @@ AddChartFinal::AddChartFinal(AddChartWizard *parent) : QWizardPage(parent), wiza
 {
     setTitle(tr("Done"));
     setSubTitle(tr("Add Chart"));
+    QVBoxLayout *blank = new QVBoxLayout(this); // just blank .. for now
+    blank->addWidget(new QWidget(this));
 }
 
 void