diff --git a/lib/gollum/templates/navbar.mustache b/lib/gollum/templates/navbar.mustache
index 2877caee..d86e8c8c 100644
--- a/lib/gollum/templates/navbar.mustache
+++ b/lib/gollum/templates/navbar.mustache
@@ -54,21 +54,21 @@
{{#allow_editing}}
{{#allow_uploads}}
-
Upload
-
+
{{/allow_uploads}}
{{#editable}}
-
Rename
-
+
-
{{#allow_editing}}
{{#editable}}