diff --git a/qml/pages/About.qml b/qml/pages/About.qml
index 033c690..b396330 100644
--- a/qml/pages/About.qml
+++ b/qml/pages/About.qml
@@ -66,71 +66,86 @@ Page {
         font.bold: true
         text: "SailOTP " + Qt.application.version
       }
-      TextArea {
-        id: desc
+      Label {
         anchors.horizontalCenter: parent.horizontalCenter
         width: parent.width
         horizontalAlignment: TextEdit.Center
-        readOnly: true
-        text:  qsTr("A Simple Sailfish OTP Generator\n(RFC 6238/4226 compatible)")
+        text:  qsTr("A simple Sailfish OTP generator")
         color: Theme.primaryColor
       }
-      TextArea {
-        id: copyright
+      Label {
         anchors.horizontalCenter: parent.horizontalCenter
         width: parent.width
         horizontalAlignment: TextEdit.Center
-        readOnly: true
-        text: qsTr("Copyright: Stefan Brand\nLicense: BSD (3-clause)")
+        font.pixelSize: Theme.fontSizeSmall
+        text:  qsTr("(RFC 6238/4226 compatible)")
         color: Theme.primaryColor
       }
       Button {
-        id: manual
+        text: qsTr("Online Manual")
         anchors.horizontalCenter: parent.horizontalCenter
-        text: "<a href=\"https://www.seiichiro0185.org/sailfish:apps:sailotp:manual\">Online Manual</a>"
         onClicked: {
           Qt.openUrlExternally("https://www.seiichiro0185.org/sailfish:apps:sailotp:manual")
         }
       }
       Button {
-        id: homepage
+        text: qsTr("Source Code & Issue Tracker")
         anchors.horizontalCenter: parent.horizontalCenter
-        text: "<a href=\"https://github.com/seiichiro0185/sailotp/\">Source Code & Issue Tracker</a>"
         onClicked: {
           Qt.openUrlExternally("https://github.com/seiichiro0185/sailotp/")
         }
       }
-      TextArea {
-        id: acknowledgement
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: parent.width
-        font.pixelSize: Theme.fontSizeSmall
-        horizontalAlignment: TextEdit.Center
-        readOnly: true
-        text: "\n"+qsTr("SailOTP uses the following third party libs:")+"\n\nhttp://caligatio.github.io/jsSHA/\nhttps://code.google.com/archive/p/crypto-js/\nhttp://sourceforge.net/projects/qzxing/\nhttp://fukuchi.org/works/qrencode/"
-        color: Theme.primaryColor
+      DetailItem {
+          width: parent.width
+          label: qsTr("Copyright")
+          value: "Stefan Brand"
       }
-
-      TextArea {
-        id: contributors
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: parent.width
-        font.pixelSize: Theme.fontSizeSmall
-        horizontalAlignment: TextEdit.Center
-        readOnly: true
-        text: qsTr("Contributors:")+"\n\nRobin Appelman: SteamGuard "+qsTr("Support")
-        color: Theme.primaryColor
+      DetailItem {
+          width: parent.width
+          label: qsTr("License")
+          value: qsTr("BSD (3-clause)")
       }
-
-      TextArea {
-        id: translators
+      Label {
         anchors.horizontalCenter: parent.horizontalCenter
         width: parent.width
         font.pixelSize: Theme.fontSizeSmall
         horizontalAlignment: TextEdit.Center
-        readOnly: true
-        text: qsTr("Translators:")+"\n\nChinese: BirdZhang\nFinnish: Johan Heikkilä\nFrench: Romain Tartière\nItalian: Tichy\nDutch: JSEHV\nRussian: moorchegue\nSpanish: p4moedo\nSwedish: Åke Engelbrektson\nEnglish: Stefan Brand\nGerman: Stefan Brand"
-        color: Theme.primaryColor
+        wrapMode: Text.WordWrap
+        text: qsTr("Contributors:")
+        color: Theme.secondaryHighlightColor
+      }
+      DetailItem {
+          label: qsTr("SteamGuard support")
+          value: "Robin Appelman"
+      }
+      Label {
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        font.pixelSize: Theme.fontSizeSmall
+        horizontalAlignment: Text.Center
+        wrapMode: Text.WordWrap
+        text: qsTr("Translators:")
+        color: Theme.secondaryHighlightColor
+      }
+      Label {
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width * 0.8
+        font.pixelSize: Theme.fontSizeSmall
+        wrapMode: Text.WordWrap
+        text: "Chinese: BirdZhang\nFinnish: Johan Heikkilä\nFrench: Romain Tartière\nItalian: Tichy\nDutch: JSEHV\nRussian: moorchegue\nSpanish: p4moedo\nSwedish: Åke Engelbrektson\nEnglish: Stefan Brand\nGerman: Stefan Brand"
+        color: Theme.highlightColor
+      }
+      LinkedLabel {
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: parent.width
+        font.pixelSize: Theme.fontSizeSmall
+        horizontalAlignment: TextEdit.Center
+        plainText: "\n"+qsTr("SailOTP uses the following third party libs:")+'
+            http://caligatio.github.io/jsSHA/
+            https://code.google.com/archive/p/crypto-js/
+            http://sourceforge.net/projects/qzxing/
+            http://fukuchi.org/works/qrencode/'
+        color: Theme.secondaryHighlightColor
       }
     }
     VerticalScrollDecorator { }
diff --git a/qml/pages/MainView.qml b/qml/pages/MainView.qml
index 577a39a..f1e57b9 100644
--- a/qml/pages/MainView.qml
+++ b/qml/pages/MainView.qml
@@ -159,10 +159,12 @@ Page {
         Row {
           id: searchRow
           width: parent.width
-          TextField {
+          SearchField {
             id: searchField
             font.pixelSize: Theme.fontSizeMedium
-            width: parent.width - clearIcon.width
+            width: parent.width
+// This would be useful, but seems to break the button altogether. Perhaps it'll work later?
+//            canHide: true
             EnterKey.enabled: false
             inputMethodHints: Qt.ImhNoPredictiveText // Qt.ImhPreferUppercase | Qt.ImhNoAutoUppercase
             placeholderText: qsTr("Search")
@@ -172,12 +174,6 @@ Page {
               }
             }
           }
-          IconButton {
-            id: clearIcon
-            icon.source: "image://theme/icon-m-backspace"
-            onClicked: searchField.text = ""
-            enabled: searchField.text.length > 0
-          }
         }
       }