diff --git a/demos/qmloscilloscope/datasource.cpp b/demos/qmloscilloscope/datasource.cpp
index c5af232..65ce532 100644
--- a/demos/qmloscilloscope/datasource.cpp
+++ b/demos/qmloscilloscope/datasource.cpp
@@ -24,12 +24,13 @@
 #include <QAbstractScrollArea>
 #include <QGLWidget>
 #include <QDebug>
+#include <cmath>
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
 DataSource::DataSource(QAbstractScrollArea *appViewer, QObject *parent) :
-    m_appViewer(appViewer),
     QObject(parent),
+    m_appViewer(appViewer),
     m_index(-1)
 {
     // generate
diff --git a/demos/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml b/demos/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
index 5fb6e34..5a47283 100644
--- a/demos/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
+++ b/demos/qmloscilloscope/qml/qmloscilloscope/ControlPanel.qml
@@ -34,8 +34,15 @@ Column {
     }
 
     MultiButton {
+        text: "Graph: "
+        items: ["line", "spline", "scatter"]
+        currentSelection: 0
+        onSelectionChanged: seriesTypeChanged(items[currentSelection]);
+    }
+
+    MultiButton {
         id: signalSourceButton
-        text: "Signal source: "
+        text: "Source: "
         items: ["sin", "linear"]
         currentSelection: 0
         onSelectionChanged: signalSourceChanged(
@@ -56,13 +63,6 @@ Column {
     }
 
     MultiButton {
-        text: "Graph: "
-        items: ["line", "spline", "scatter"]
-        currentSelection: 0
-        onSelectionChanged: seriesTypeChanged(items[currentSelection]);
-    }
-
-    MultiButton {
         text: "Refresh rate: "
         items: [1, 24, 60, 100]
         currentSelection: 2
diff --git a/demos/qmloscilloscope/qml/qmloscilloscope/MultiButton.qml b/demos/qmloscilloscope/qml/qmloscilloscope/MultiButton.qml
index 3c5d3e1..eedefb6 100644
--- a/demos/qmloscilloscope/qml/qmloscilloscope/MultiButton.qml
+++ b/demos/qmloscilloscope/qml/qmloscilloscope/MultiButton.qml
@@ -22,10 +22,10 @@ import QtQuick 1.0
 
 Rectangle {
     id: button
-    width: 105
-    height: 33
+    width: 120
+    height: 35
     border.color: "gray"
-    radius: 5
+    radius: 7
     property string text: "Option: "
     property variant items: ["first"]
     property int currentSelection: 0