diff --git a/bouquin/main_window.py b/bouquin/main_window.py
index 6cd6f17..7d2fbfc 100644
--- a/bouquin/main_window.py
+++ b/bouquin/main_window.py
@@ -210,14 +210,14 @@ class MainWindow(QMainWindow):
         # Navigate menu with next/previous/today
         nav_menu = mb.addMenu("&Navigate")
         act_prev = QAction("Previous Day", self)
-        act_prev.setShortcut("Ctrl+<")
+        act_prev.setShortcut("Ctrl+P")
         act_prev.setShortcutContext(Qt.ApplicationShortcut)
         act_prev.triggered.connect(lambda: self._adjust_day(-1))
         nav_menu.addAction(act_prev)
         self.addAction(act_prev)
 
         act_next = QAction("Next Day", self)
-        act_next.setShortcut("Ctrl+>")
+        act_next.setShortcut("Ctrl+N")
         act_next.setShortcutContext(Qt.ApplicationShortcut)
         act_next.triggered.connect(lambda: self._adjust_day(1))
         nav_menu.addAction(act_next)
diff --git a/bouquin/settings_dialog.py b/bouquin/settings_dialog.py
index 2f8ce5d..c981388 100644
--- a/bouquin/settings_dialog.py
+++ b/bouquin/settings_dialog.py
@@ -93,12 +93,6 @@ class SettingsDialog(QDialog):
         line.setFrameShadow(QFrame.Sunken)
         enc.addWidget(line)
 
-        # Change key button
-        self.rekey_btn = QPushButton("Change key")
-        self.rekey_btn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.rekey_btn.clicked.connect(self._change_key)
-        enc.addWidget(self.rekey_btn, 0, Qt.AlignLeft)
-
         self.idle_spin = QSpinBox()
         self.idle_spin.setRange(0, 240)
         self.idle_spin.setSingleStep(1)
@@ -124,6 +118,18 @@ class SettingsDialog(QDialog):
         spin_row.addWidget(self.idle_spin_label)
         enc.addLayout(spin_row)
 
+        line2 = QFrame()
+        line2.setFrameShape(QFrame.HLine)
+        line2.setFrameShadow(QFrame.Sunken)
+        enc.addWidget(line2)
+
+        # Change key button
+        self.rekey_btn = QPushButton("Change encryption key")
+        self.rekey_btn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.rekey_btn.clicked.connect(self._change_key)
+
+        enc.addWidget(self.rekey_btn, 0, Qt.AlignLeft)
+
         # Put the group into the form so it spans the full width nicely
         form.addRow(enc_group)
 
diff --git a/bouquin/toolbar.py b/bouquin/toolbar.py
index 1304acf..241e15c 100644
--- a/bouquin/toolbar.py
+++ b/bouquin/toolbar.py
@@ -53,7 +53,7 @@ class ToolBar(QToolBar):
         self.actH1.setShortcut("Ctrl+1")
         self.actH2.setShortcut("Ctrl+2")
         self.actH3.setShortcut("Ctrl+3")
-        self.actNormal.setShortcut("Ctrl+N")
+        self.actNormal.setShortcut("Ctrl+O")
         self.actH1.triggered.connect(lambda: self.headingRequested.emit(24))
         self.actH2.triggered.connect(lambda: self.headingRequested.emit(18))
         self.actH3.triggered.connect(lambda: self.headingRequested.emit(14))
diff --git a/pyproject.toml b/pyproject.toml
index 795ba1e..85c063f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bouquin"
-version = "0.1.6"
+version = "0.1.7"
 description = "Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher."
 authors = ["Miguel Jacq <mig@mig5.net>"]
 readme = "README.md"