diff --git a/app/gui/PcView.qml b/app/gui/PcView.qml
index 84bf4635..5ed167e5 100644
--- a/app/gui/PcView.qml
+++ b/app/gui/PcView.qml
@@ -17,6 +17,7 @@ GridView {
     anchors.bottomMargin: 5
     cellWidth: 350; cellHeight: 350;
     focus: true
+    objectName: "Computers"
 
     Component.onCompleted: {
         // Start polling when this view is shown
@@ -135,6 +136,7 @@ GridView {
                         var component = Qt.createComponent("AppView.qml")
                         var appView = component.createObject(stackView)
                         appView.computerIndex = index
+                        appView.objectName = "Apps on " + model.name
                         stackView.push(appView)
                     }
                     else {
diff --git a/app/gui/SettingsView.qml b/app/gui/SettingsView.qml
new file mode 100644
index 00000000..5f54ed42
--- /dev/null
+++ b/app/gui/SettingsView.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.9
+Rectangle {
+    id: settingsPage
+    color: "#333333"
+    objectName: "Settings"
+
+    // TODO - add settings
+}
diff --git a/app/gui/main.qml b/app/gui/main.qml
index d02127e9..9c5d2e88 100644
--- a/app/gui/main.qml
+++ b/app/gui/main.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.3
 
 ApplicationWindow {
     id: window
@@ -13,4 +14,60 @@ ApplicationWindow {
         initialItem: "PcView.qml"
         anchors.fill: parent
     }
+
+    header: ToolBar {
+
+        RowLayout {
+            spacing: 20
+            anchors.fill: parent
+
+            ToolButton {
+                // Only make the button visible if the user has navigated somewhere.
+                visible: stackView.depth > 1
+
+                icon.source: "qrc:/res/arrow_left.png"
+                onClicked: stackView.pop()
+
+                Menu {
+                    id: backButton
+                    x: parent.width - width
+                    transformOrigin: Menu.TopRight
+                }
+            }
+
+            Label {
+                id: titleLabel
+                text: stackView.currentItem.objectName
+                font.pointSize: 15
+                elide: Label.ElideRight
+                horizontalAlignment: Qt.AlignHCenter
+                verticalAlignment: Qt.AlignVCenter
+                Layout.fillWidth: true
+            }
+
+            ToolButton {
+                icon.source: "qrc:/res/settings.png"
+                onClicked: stackView.push("qrc:/gui/SettingsView.qml")
+
+                Menu {
+                    id: optionsMenu
+                    x: parent.width
+                    transformOrigin: Menu.TopRight
+                }
+            }
+
+            ToolButton {
+                icon.source: "qrc:/res/question_mark.png"
+
+                // TODO need to make sure browser is brought to foreground.
+                onClicked: Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide");
+
+                Menu {
+                    id: helpButton
+                    x: parent.width
+                    transformOrigin: Menu.TopRight
+                }
+            }
+        }
+    }
 }
diff --git a/app/qml.qrc b/app/qml.qrc
index 08f52b4c..83a8c65a 100644
--- a/app/qml.qrc
+++ b/app/qml.qrc
@@ -6,5 +6,6 @@
         <file>gui/ic_tv_white_48px.svg</file>
         <file>gui/ic_add_to_queue_white_48px.svg</file>
         <file>gui/AppView.qml</file>
+        <file>gui/SettingsView.qml</file>
     </qresource>
 </RCC>
diff --git a/app/res/arrow_left.png b/app/res/arrow_left.png
new file mode 100644
index 00000000..6454cbd2
Binary files /dev/null and b/app/res/arrow_left.png differ
diff --git a/app/res/question_mark.png b/app/res/question_mark.png
new file mode 100644
index 00000000..a701cb88
Binary files /dev/null and b/app/res/question_mark.png differ
diff --git a/app/res/settings.png b/app/res/settings.png
new file mode 100644
index 00000000..235a319d
Binary files /dev/null and b/app/res/settings.png differ
diff --git a/app/resources.qrc b/app/resources.qrc
index a96cfa0a..d8a15310 100644
--- a/app/resources.qrc
+++ b/app/resources.qrc
@@ -5,5 +5,8 @@
         <file>res/ic_remove_from_queue_white_48px.svg</file>
         <file>res/ic_videogame_asset_white_48px.svg</file>
         <file>res/no_app_image.png</file>
+        <file>res/settings.png</file>
+        <file>res/question_mark.png</file>
+        <file>res/arrow_left.png</file>
     </qresource>
 </RCC>