diff --git a/aqt/main.py b/aqt/main.py
index c642a404a..47e012d8f 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -477,6 +477,28 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
         print "applystyles"
         #applyStyles(self)
 
+    # Key handling
+    ##########################################################################
+
+    def setupKeys(self):
+        self.keyDelegate = None
+
+    def keyPressEvent(self, evt):
+        QMainWindow.keyPressEvent(self, evt)
+        # check global keys
+        key = unicode(evt.text())
+        if key == "d":
+            self.moveToState("deckBrowser")
+        elif key == "s":
+            if self.state == "overview":
+                self.moveToState("review")
+            else:
+                self.moveToState("overview")
+        elif key == "a":
+            self.onAddCard()
+        elif key == "b":
+            self.onBrowse()
+
     # App exit
     ##########################################################################
 
diff --git a/aqt/reviewer.py b/aqt/reviewer.py
index 4dd4086be..24e542acd 100644
--- a/aqt/reviewer.py
+++ b/aqt/reviewer.py
@@ -364,18 +364,38 @@ button { font-weight: normal; }
         return """
 <table width=100%% cellspacing=0 cellpadding=0>
 <tr>
-<td align=left width=50 valign=top class=stat><span class=stattxt>%(rem)s</span><br>
+<td align=left width=50 valign=top class=stat>
+<span class=stattxt>%(rem)s</span><br>
 <button onclick="py.link('edit');">%(edit)s</button></td>
 <td align=center valign=top>
 %(middle)s
 </td>
-<td width=75 align=right valign=top class=stat><span class=stattxt>0:53</span><br>
+<td width=75 align=right valign=top class=stat><span id=time class=stattxt>
+</span><br>
 <button onclick="py.link('more');">%(more)s &#9662;</button>
 </td>
 </tr>
 </table>
-<script>$(function () { $("#ansbut").focus(); });</script>
-""" % dict(middle=middle, rem=self._remaining(), edit=_("Edit"), more=_("More"))
+<script>
+var time = %(time)d;
+$(function () {
+$("#ansbut").focus();
+updateTime();
+setInterval(function () { time += 1; updateTime() }, 1000);
+});
+
+var updateTime = function () {
+    var m = Math.floor(time / 60);
+    var s = time %% 60;
+    if (s < 10) {
+        s = "0" + s;
+    }
+    var e = $("#time").text(time);
+    e.text(m + ":" + s);
+}
+</script>
+""" % dict(middle=middle, rem=self._remaining(), edit=_("Edit"),
+           more=_("More"), time=self.card.timeTaken()/1000)
 
     def _showAnswerButton(self):
         self.bottom.web.setFocus()
@@ -389,7 +409,6 @@ button { font-weight: normal; }
             self.bottom._css + self._bottomCSS)
 
     def _showEaseButtons(self):
-        print self._answerButtons()
         self.bottom.web.stdHtml(
             self._bottomHTML(self._answerButtons()),
             self.bottom._css + self._bottomCSS)
diff --git a/aqt/toolbar.py b/aqt/toolbar.py
index bcca3ca72..59d5ad10a 100644
--- a/aqt/toolbar.py
+++ b/aqt/toolbar.py
@@ -115,6 +115,10 @@ color: #000;
 .hitem:hover {
 text-decoration: underline;
 }
+
+button {
+font-weight: normal;
+}
 """
 
 class BottomBar(Toolbar):