diff --git a/views/app/challenges.html b/views/app/challenges.html
index 6b44a33af7..4f36bc8415 100644
--- a/views/app/challenges.html
+++ b/views/app/challenges.html
@@ -67,6 +67,11 @@
         </div>
         <div id="accordion-challenge-{{@challenge.id}}" class="accordion-body collapse in">
             <div class="accordion-inner">
+                {#if @challenge.prize}
+                    <a class="pull-right gem-wallet">
+                        <span class="task-action-btn tile flush neutral"><div class="Gems"></div> {@challenge.prize} Gem Prize</span>
+                    </a>
+                {/}
 
                 {#if _editing.challenges[@challenge.id]}
                     <a class=btn x-bind='click:toggleChallengeEdit' data-id={{@challenge.id}} >Done</a>
@@ -75,13 +80,10 @@
                         <textarea cols=3 class='option-content' placeholder='Description'>{@challenge.description}</textarea>
                         <input type=number class='option-content' placeholder='Gems Prize' value={@challenge.prize} />
                     </div>
-                {else if equal(@challenge.uid,_user.id)}
-                    <a class=btn x-bind='click:toggleChallengeEdit' data-id={{@challenge.id}} >Edit</a>
                 {/}
-                {#if @challenge.prize}
-                    <a class="pull-right gem-wallet">
-                        <span class="task-action-btn tile flush neutral"><div class="Gems"></div> {@challenge.prize} Gem Prize</span>
-                    </a>
+                <!-- elseif breaks here, have to start a new if --->
+                {#if and(not(_editing.challenges[@challenge.id]),equal(@challenge.uid,_user.id))}
+                    <a class=btn x-bind='click:toggleChallengeEdit' data-id={{@challenge.id}} >Edit</a>
                 {/}
                 {#if @challenge.description}<div>{@challenge.description}</div>{/}
 
diff --git a/views/app/tasks.html b/views/app/tasks.html
index a4d5e58613..152a53dc07 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -178,6 +178,8 @@
             {{#if :task.challenge}}
                 {{#if brokenChallengeLink(:task)}}
                     <i class='icon-bullhorn' style='background-color:red;' x-bind=click:toggleTaskEdit rel=tooltip title="Broken Challenge Link"></i>
+                {{else}}
+                    <i class='icon-bullhorn' rel=tooltip title="Challenge Task"></i>
                 {{/}}
             {{else}}
                 <!-- delete -->