diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
index 7caf71f..7129a52 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml
@@ -156,7 +156,7 @@ MenuBar {
         Action {
             text: qsTr("&User manual")
             icon.name: 'documentation'
-            onTriggered: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/User-Manual")
+            onTriggered: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/_Sidebar")
         }
         Action {
             text: qsTr("&Changelog")
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/About.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/About.qml
index 9fe9145..d4bfb99 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/About.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/About.qml
@@ -101,13 +101,24 @@ You should have received a copy of the GNU General Public License along with thi
         onLinkActivated: Qt.openUrlExternally(link)
     }
     
-    Button {
-        id: openIssueButton
+    Row {
         anchors.top: copyrightInfos.bottom
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.topMargin: 10
-        text: qsTr('Report a bug')
-        icon.name: 'bug'
-        onClicked: Qt.openUrlExternally('https://git.ad5001.eu/Ad5001/LogarithmPlotter')
+        spacing: 5
+        
+        Button {
+            id: openIssueButton
+            text: qsTr('Report a bug')
+            icon.name: 'tools-report-bug'
+            onClicked: Qt.openUrlExternally('https://git.ad5001.eu/Ad5001/LogarithmPlotter')
+        }
+        
+        Button {
+            id: officialWebsiteButton
+            text: qsTr('Official website')
+            icon.name: 'web-browser'
+            onClicked: Qt.openUrlExternally('https://apps.ad5001.eu/logarithmplotter/')
+        }
     }
 }
diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml
index b8f5593..d7c3129 100644
--- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml
+++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/Popup/GreetScreen.qml
@@ -120,8 +120,16 @@ Popup {
     Row {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 10
+        spacing: 10
         anchors.horizontalCenter: parent.horizontalCenter
         
+        Button {
+            id: userManualBtn
+            text: qsTr("User manual")
+            font.pixelSize: 18
+            onClicked: Qt.openUrlExternally("https://git.ad5001.eu/Ad5001/LogarithmPlotter/wiki/_Sidebar")
+        }
+        
         Button {
             id: changelogBtn
             text: qsTr("Changelog")