diff --git a/src/main/twirl/issues/labels/edit.scala.html b/src/main/twirl/issues/labels/edit.scala.html
index b21d33d..dd558d2 100644
--- a/src/main/twirl/issues/labels/edit.scala.html
+++ b/src/main/twirl/issues/labels/edit.scala.html
@@ -6,14 +6,14 @@
   <form style="margin-bottom: 0px;">
     <input type="text" id="labelName-@labelId" style="width: 300px; margin-bottom: 0px;" value="@label.map(_.labelName)"@if(labelId == "new"){ placeholder="New label name"}/>
     <div id="label-color-@labelId" class="input-append color bscp" data-color="#@label.map(_.color).getOrElse("888888")" data-color-format="hex" style="width: 100px; margin-bottom: 0px;">
-      <input type="text" class="span3" id="labelColor-@labelId" value="#@label.map(_.color)" readonly style="width: 100px;">
+      <input type="text" class="span3" id="labelColor-@labelId" value="#@label.map(_.color).getOrElse("888888")" readonly style="width: 100px;">
       <span class="add-on"><i style="background-color: #@label.map(_.color).getOrElse("888888");"></i></span>
     </div>
     <script>
     $('div#label-color-@labelId').colorpicker();
     </script>
-    <span id="label-error-@labelId" class="error" style="padding-left: 40px;"></span>
     <span class="pull-right">
+      <span id="label-error-@labelId" class="error"></span>
       <input type="button" id="cancel-@labelId" class="btn label-edit-cancel" value="Cancel">
       <input type="button" id="submit-@labelId" class="btn btn-success" style="margin-bottom: 0px;" value="@(if(labelId == "new") "Create label"  else "Save changes")"/>
     </span>
diff --git a/src/main/twirl/issues/labels/list.scala.html b/src/main/twirl/issues/labels/list.scala.html
index 135f77c..f21a88b 100644
--- a/src/main/twirl/issues/labels/list.scala.html
+++ b/src/main/twirl/issues/labels/list.scala.html
@@ -36,14 +36,14 @@
 <script>
 $(function(){
   $('#new-label-button').click(function(e){
-    if($('#new-label-area').size() != 0){
+    if($('#edit-label-area-new').size() != 0){
+      $('div#edit-label-area-new').remove();
       $('#new-label-table').hide();
-      $('#new-label-area').remove();
     } else {
       $.get('@url(repository)/issues/labels/new',
-          function(data){
-            $('#new-label-table').show().find('tr td').append(data);
-          }
+        function(data){
+          $('#new-label-table').show().find('tr td').append(data);
+        }
       );
     }
   });