diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index f41ccba..1106a2b 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -144,7 +144,11 @@
</tr>
#end
#else
- <tr><td class="last">No Users Found.</td></tr>
+ #if ($isAdmin)
+ <tr><td colspan="7">No Users Found.</td></tr>
+ #else
+ <tr><td colspan="6">No Users Found.</td></tr>
+ #end
#end
</tbody>
</table>
@@ -199,7 +203,11 @@
</tr>
#end
#else
- <tr><td class="last">No Groups Found.</td></tr>
+ #if ($isAdmin)
+ <tr><td colspan="7">No Groups Found.</td></tr>
+ #else
+ <tr><td colspan="6">No Groups Found.</td></tr>
+ #end
#end
</tbody>
</table>
@@ -223,13 +231,17 @@
#foreach ($proxyUser in $proxyUsers)
<tr>
<td class="tb-username">#if($proxyUser == $username) ${proxyUser} <span class="sublabel">(you)</span> #else $proxyUser #end</td>
- #if($isAdmin)
+ #if ($isAdmin)
<td><button id="proxy-${proxyUser}" name="${proxyUser}" class="btn btn-xs btn-primary">Remove</button></td>
#end
</tr>
#end
#else
- <tr><td class="last">No Proxy User Found.</td></tr>
+ #if ($isAdmin)
+ <tr><td colspan="2">No Proxy User Found.</td></tr>
+ #else
+ <tr><td>No Proxy User Found.</td></tr>
+ #end
#end
</tbody>
</table>
diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index 03a63bd..361da87 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -120,7 +120,7 @@
#end
#else
<tr>
- <td class="last">No scheduled flow found.</td>
+ <td colspan="10">No scheduled flow found.</td>
</tr>
#end
</tbody>
