diff --git a/src/main/twirl/wiki/edit.scala.html b/src/main/twirl/wiki/edit.scala.html
index 6177974..d75ccbb 100644
--- a/src/main/twirl/wiki/edit.scala.html
+++ b/src/main/twirl/wiki/edit.scala.html
@@ -3,16 +3,16 @@
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main(s"${if(pageName == "") "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
+@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("wiki", repository)
   @tab("", repository)
   <ul class="nav nav-tabs">
     <li>
-      <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
+      <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
     </li>
     <li class="pull-right">
       <div class="btn-group">
-      @if(pageName != ""){
+      @if(page.isDefined){
         <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
         <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
         <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
@@ -20,7 +20,7 @@
       </div>
     </li>
   </ul>
-  <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
+  <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
     <span id="error-pageName" class="error"></span>
     <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
     @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 900px; height: 400px;", "")