diff --git a/static/css/aowow.css b/static/css/aowow.css
index 77a9f79b..391a59ef 100644
--- a/static/css/aowow.css
+++ b/static/css/aowow.css
@@ -171,10 +171,6 @@ h5 a.icontiny span { text-decoration:none !important; }
     width: 47%;
 }
 
-.random-enchantments span{
-    cursor: help;
-}
-
 h1.h1-icon {
     padding-top: 5px !important;
 }
diff --git a/template/pages/achievement.tpl.php b/template/pages/achievement.tpl.php
index 6c037e67..e7de7bc3 100644
--- a/template/pages/achievement.tpl.php
+++ b/template/pages/achievement.tpl.php
@@ -37,7 +37,7 @@ foreach ($this->criteria['data'] as $i => $cr):
         echo '<ul><li><var>&nbsp;</var></li></ul>';
     endif;
 
-    echo '</th><td>';
+    echo '</th><td><span class="tip" title="ID'.Lang::main('colon').$cr['id'].'">';
 
     if (!empty($cr['link'])):
         echo '<a href="'.$cr['link']['href'].'"'.(isset($cr['link']['quality']) ? ' class="q'.$cr['link']['quality'].'"' : null).'>'.Util::htmlEscape($cr['link']['text']).'</a>';
@@ -51,11 +51,7 @@ foreach ($this->criteria['data'] as $i => $cr):
         echo ' '.$cr['extraText'];
     endif;
 
-    if (User::isInGroup(U_GROUP_STAFF)):
-        echo ' <small title="'.Lang::achievement('criteriaType').' '.$cr['type'].'" class="q0">['.$cr['id'].']</small>';
-    endif;
-
-    echo '</td></tr>';
+    echo '</span></td></tr>';
 
     // every odd number of elements
     if ($i + 1 == round(count($this->criteria['data']) / 2)):
diff --git a/template/pages/item.tpl.php b/template/pages/item.tpl.php
index a92b8567..8717f9a6 100644
--- a/template/pages/item.tpl.php
+++ b/template/pages/item.tpl.php
@@ -48,7 +48,7 @@ if (!empty($this->subItems)):
                     $eText[] = '<a style="text-decoration:none; color:#CCCCCC;" href="?enchantment='.$eId.'">'.$txt.'</a>';
                 endforeach;
 
-                echo '                        <li><div><span title="ID'.Lang::main('colon').$this->subItems['randIds'][$k].'" class="q'.$this->subItems['quality'].'">...'.$i['name'].'</span>';
+                echo '                        <li><div><span title="ID'.Lang::main('colon').$this->subItems['randIds'][$k].'" class="tip q'.$this->subItems['quality'].'">...'.$i['name'].'</span>';
                 echo '                        <small class="q0">'.sprintf(Lang::item('_chance'), $i['chance']).'</small><br />'.implode(', ', $eText).'</div></li>';
             endif;
         endforeach;
@@ -68,7 +68,7 @@ if (!empty($this->subItems)):
                     $eText[] = '<a style="text-decoration:none; color:#CCCCCC;" href="?enchantment='.$eId.'">'.$txt.'</a>';
                 endforeach;
 
-                echo '                        <li><div><span title="ID'.Lang::main('colon').$this->subItems['randIds'][$k].'" class="q'.$this->subItems['quality'].'">...'.$i['name'].'</span>';
+                echo '                        <li><div><span title="ID'.Lang::main('colon').$this->subItems['randIds'][$k].'" class="tip q'.$this->subItems['quality'].'">...'.$i['name'].'</span>';
                 echo '                        <small class="q0">'.sprintf(Lang::item('_chance'), $i['chance']).'</small><br />'.implode(', ', $eText).'</div></li>';
             endif;
         endforeach;