diff --git a/templates/deck.html b/templates/deck.html
index 7fab412..1b78d47 100644
--- a/templates/deck.html
+++ b/templates/deck.html
@@ -15,9 +15,9 @@
 				<input type="hidden" name="card_id" value="{{ card['id'] }}">
 				<!-- <span id="buttonContainer" style="display: flex; justify-content: space-around;"> -->
 				<span id="buttonContainer">
-					<button type="submit" name="rate" value="Yes" accesskey="1">Yes</button> <!--ti keyi so alt+shit+key...-->
-					<button type="submit" name="rate" value="Maybe" accesskey="2">Maybe</button>
-					<button type="submit" name="rate" value="No" accesskey="3">No</button>
+					<button type="submit" name="rate" value="Yes" accesskey="1">Yes (1)</button> <!--ti keyi so alt+shit+key...-->
+					<button type="submit" name="rate" value="Maybe" accesskey="2">Maybe ({{maybe_in}})</button>
+					<button type="submit" name="rate" value="No" accesskey="3">No ({{no_in}})</button>
 					<button type="submit" name="rate" value="Delete" accesskey="d">Delete</button>
 					<button type="submit" name="share" value="Share" accesskey="s">Share</button>
 				</span>      
diff --git a/templates/menu.html b/templates/menu.html
index ad76ddb..e3f2bc3 100644
--- a/templates/menu.html
+++ b/templates/menu.html
@@ -5,10 +5,12 @@
 {% block content %}
 <main>
 <form method="post">
-	{% if deck_status == "old" %}
-	<button type="submit" name="menu" value="new_session">Continue</button>
-	{% else %}
-	<button type="submit" name="menu" value="new_session">Start</button>
+	{% if deck_status == "start" %}
+	<button type="submit" name="menu" value="new_session">Start {{remaining_new}}/{{remaining_due}}</button>
+	{% elif deck_status == "continue" %}
+	<button type="submit" name="menu" value="new_session">Continue {{remaining_new}}/{{remaining_due}}</button>
+	{% elif deck_status == "done" %}
+	<button disabled type="submit" name="menu" value="new_session">Start</button>
 	{% endif %}
 
 	<button type="submit" name="menu" value="matches">Matches</button>