diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index 9c003f32dcaf30e5ce154257e90b80681b3763e5..e975e652693606b0b34039b0d0fe8574e96081fa 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -37,6 +37,7 @@ import hudson.util.FormApply;
 import hudson.util.RunList;
 import hudson.util.XStream2;
 import jenkins.model.Jenkins;
+import jenkins.model.ModelObjectWithContextMenu;
 import net.sf.json.JSONObject;
 
 import org.acegisecurity.Authentication;
@@ -100,7 +101,7 @@ import javax.annotation.Nonnull;
  * @author Kohsuke Kawaguchi
  */
 @ExportedBean
-public class User extends AbstractModelObject implements AccessControlled, DescriptorByNameOwner, Saveable, Comparable<User> {
+public class User extends AbstractModelObject implements AccessControlled, DescriptorByNameOwner, Saveable, Comparable<User>, ModelObjectWithContextMenu {
     
     private transient final String id;
 
@@ -695,6 +696,10 @@ public class User extends AbstractModelObject implements AccessControlled, Descr
         return Collections.unmodifiableList(actions);
     }
 
+    public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws Exception {
+        return new ContextMenu().from(this,request,response);
+    }
+
     public static abstract class CanonicalIdResolver extends AbstractDescribableImpl<CanonicalIdResolver> implements Comparable<CanonicalIdResolver> {
 
         /**
diff --git a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
index 4edd160b4c96d81789e198ab041458440380d959..42cb3e534dd066646e52f2aa7d4916b524725a59 100644
--- a/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
@@ -35,7 +35,7 @@ THE SOFTWARE.
           <img src="${imagesURL}/24x24/grey.png" tooltip="${%Not run}" alt="${%Not run}" height="24" width="24"/>
         </j:when>
         <j:otherwise>
-          <a href="${p.nearestRunUrl}" class="model-link">
+          <a href="${p.nearestRunUrl}" class="model-link inside">
             <img src="${imagesURL}/24x24/${b.buildStatusUrl}" tooltip="${p.tooltip} ${it.number!=b.number?(it.isBuilding()?'- pending' : '- skipped'):''}" alt="${p.tooltip}" style="${it.number!=b.number?'opacity:0.5':''}" height="24" width="24"/>
             <j:if test="${empty(o.x) and empty(o.y)}">
               ${p.combination.toString(o.z)}
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
index b91276b29ff571bbce4d55c0ab8ba731e0263be5..d2cfaf607ad23fab7452a062af797a2aec904a6f 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
           <img src="${imagesURL}/24x24/grey.png" tooltip="${%Not configured}" alt="${%Not configured}" height="24" width="24"/>
         </j:when>
         <j:otherwise>
-          <a href="${p.shortUrl}" class="model-link">
+          <a href="${p.shortUrl}" class="model-link inside">
             <img src="${imagesURL}/24x24/${p.buildStatusUrl}" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}" height="24" width="24"/>
             <j:if test="${empty(o.x) and empty(o.y)}">
               ${p.combination.toString(o.z)}
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
index 980600f036b236764599b9bad04df7dce467c0a7..7dbf81516f2e940532dc1509b9366eace88f438f 100644
--- a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
+++ b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
@@ -43,8 +43,7 @@ THE SOFTWARE.
       <j:set var="atr" value="${it.lastCompletedBuild.aggregatedTestResultAction}"/>
       <j:if test="${atr!=null}">
         <t:summary icon="clipboard.png">
-          <a href="lastCompletedBuild/testReport/" class="model-link">${%Latest Test Result}</a>
-          <st:nbsp/>
+          <a href="lastCompletedBuild/testReport/" class="model-link inside">${%Latest Test Result}</a>
           <t:test-result it="${atr}" />
         </t:summary>
       </j:if>
diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly
index 367bbe5d0f29e95c4e62b9c021ff4365b22657fe..1879ad1e39a4e2ca3a6da193e4fb86bb2602a23f 100644
--- a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly
+++ b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly
@@ -77,7 +77,7 @@ THE SOFTWARE.
                       <st:nbsp/>
                       <j:choose>
                         <j:when test="${dep.from!=null}">
-                          <a href="${rootURL}/${dep.from.url}" class="model-link">
+                          <a href="${rootURL}/${dep.from.url}" class="model-link inside">
                             <img src="${imagesURL}/16x16/${dep.from.buildStatusUrl}"
                                  alt="${dep.from.iconColor.description}" height="16" width="16" />${dep.from.displayName}</a>
                         </j:when>
@@ -88,7 +88,7 @@ THE SOFTWARE.
 
                       &#x2192; <!-- right arrow -->
 
-                      <a href="${rootURL}/${dep.to.url}" class="model-link">
+                      <a href="${rootURL}/${dep.to.url}" class="model-link inside">
                         <img src="${imagesURL}/16x16/${dep.to.buildStatusUrl}"
                              alt="${dep.to.iconColor.description}" height="16" width="16" />${dep.to.displayName}</a>
 
@@ -122,7 +122,7 @@ THE SOFTWARE.
         <ul style="list-style-type: none;">
           <j:forEach var="item" items="${upstream}">
             <li>
-              <a href="${rootURL}/${item.key.url}" class="model-link">${item.key.displayName}</a>
+              <a href="${rootURL}/${item.key.url}" class="model-link inside">${item.key.displayName}</a>
               <t:buildLink job="${item.key}" number="${item.value}" />
             </li>
           </j:forEach>
@@ -134,7 +134,7 @@ THE SOFTWARE.
         <ul style="list-style-type: none;">
           <j:forEach var="item" items="${downstream}">
             <li>
-              <a href="${rootURL}/${item.key.url}" class="model-link">${item.key.displayName}</a>
+              <a href="${rootURL}/${item.key.url}" class="model-link inside">${item.key.displayName}</a>
               <j:choose>
                 <j:when test="${item.value.isEmpty()}">
                   (${%none})
diff --git a/core/src/main/resources/hudson/model/AbstractProject/main.jelly b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
index e60dc3ca64b036f27e3638f80b84ed69a29b0939..ad1dacad68892ce0c34823dfd013e4940e6bd9a4 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/main.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
@@ -55,8 +55,7 @@ THE SOFTWARE.
     <j:if test="${tr!=null}">
       <j:if test="${tr.class.name != 'hudson.tasks.test.AggregatedTestResultAction'}">
         <t:summary icon="clipboard.png">
-          <a href="lastCompletedBuild/testReport/" class="model-link">${%Latest Test Result}</a>
-          <st:nbsp/>
+          <a href="lastCompletedBuild/testReport/" class="model-link inside">${%Latest Test Result}</a>
           <t:test-result it="${tr}" />
         </t:summary>
       </j:if>
@@ -65,8 +64,7 @@ THE SOFTWARE.
     <j:set var="atr" value="${it.lastCompletedBuild.aggregatedTestResultAction}"/>
     <j:if test="${atr!=null}">
       <t:summary icon="clipboard.png">
-        <a href="lastCompletedBuild/aggregatedTestReport/" class="model-link">${%Latest Aggregated Test Result}</a>
-        <st:nbsp/>
+        <a href="lastCompletedBuild/aggregatedTestReport/" class="model-link inside">${%Latest Aggregated Test Result}</a>
         <t:test-result it="${atr}" />
       </t:summary>
     </j:if>
diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly
index 071d2237d9be7d82b319540e5ab364464527e85a..53daa27706c31b52931cb788434c9ec85f8942c6 100644
--- a/core/src/main/resources/hudson/model/Computer/index.jelly
+++ b/core/src/main/resources/hudson/model/Computer/index.jelly
@@ -93,8 +93,7 @@ THE SOFTWARE.
           <j:forEach var="entry" items="${it.node.labelCloud}">
             <!-- Skip the label for this node -->
             <j:if test="${entry.item!=it.node.selfLabel}">
-              <a class="${entry.className} model-link" href="${rootURL}/label/${entry.item.name}">${entry.item.name}</a>
-              <st:nbsp/>
+              <a class="${entry.className} model-link inside" href="${rootURL}/label/${entry.item.name}">${entry.item.name}</a>
             </j:if>
           </j:forEach>
         </div>
diff --git a/core/src/main/resources/hudson/model/ComputerSet/index.jelly b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
index 08e3a51243efe67f9db0ad2150493ee3cf783d4b..b7fc3a15376476a779e5f213f980af2430c06fdb 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/index.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/index.jelly
@@ -56,7 +56,7 @@ THE SOFTWARE.
           <td width="32" data="${c.icon}">
             <img src="${imagesURL}/32x32/${c.icon}" width="32" height="32" alt="${c.iconAltText}"/>
           </td>
-          <td><a href="${rootURL}/${c.url}" class="model-link">${c.displayName}</a></td>
+          <td><a href="${rootURL}/${c.url}" class="model-link inside">${c.displayName}</a></td>
           <j:forEach var="m" items="${monitors}">
             <j:if test="${m.columnCaption!=null}">
               <j:set var="data" value="${m.data(c)}"/>
diff --git a/core/src/main/resources/hudson/model/Fingerprint/index.jelly b/core/src/main/resources/hudson/model/Fingerprint/index.jelly
index 8fad152a58be682421db6c94acf4dac8624d86da..5952dad6024e681b9ca90b4a8e659523a29f32c7 100644
--- a/core/src/main/resources/hudson/model/Fingerprint/index.jelly
+++ b/core/src/main/resources/hudson/model/Fingerprint/index.jelly
@@ -73,7 +73,7 @@ THE SOFTWARE.
                 <td class="fingerprint-summary-header">
                   <j:choose>
                     <j:when test="${job!=null}">
-                      <a href="${rootURL}/${job.url}" class="model-link">${j}</a>
+                      <a href="${rootURL}/${job.url}" class="model-link inside">${j}</a>
                     </j:when>
                     <j:otherwise>
                       ${j}
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
index b7823d4513134beab6737a352d9efdb872015cdc..ec41aca7154d6c43bcc4ca890c331d62193aed1f 100644
--- a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
+++ b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
@@ -57,8 +57,8 @@ THE SOFTWARE.
                   	<img width="16" height="16" src="${imagesURL}/16x16/${r.buildStatusUrl}" alt="${r.iconColor.description}" />
                   </td>
                   <td data="${r.number}">
-                    <a href="${r.number}/" class="model-link">
-                    ${r.displayName}
+                    <a href="${r.number}/" class="model-link inside">
+                      ${r.displayName}
                     </a>
                   </td>
                   <td data="${r.duration}">
diff --git a/core/src/main/resources/hudson/model/Label/index.jelly b/core/src/main/resources/hudson/model/Label/index.jelly
index 57a68463129577928f48b01c7394d1627f0f4f73..924522c75af2e03c71e50ab07355a07488b0b2a9 100644
--- a/core/src/main/resources/hudson/model/Label/index.jelly
+++ b/core/src/main/resources/hudson/model/Label/index.jelly
@@ -36,11 +36,10 @@ THE SOFTWARE.
         ${%Nodes:}
         <j:forEach var="n" items="${it.nodes}">
           <j:set var="c" value="${app.getComputer(n.nodeName)}"/>
-          <a href="${rootURL}/computer/${n.nodeName}" class="model-link">
+          <a href="${rootURL}/computer/${n.nodeName}" class="model-link inside">
             <img src="${imagesURL}/16x16/${c.icon}" width="16" height="16" alt=""/>
             ${c.displayName}
           </a>
-          <st:nbsp />
         </j:forEach>
       </div>
 
diff --git a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.jelly b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.jelly
index b26d2b37d9c56fa2d30c2121c8b273fcf33dbee9..c4834937df4251261192a483d41b298ee4b9c4c8 100644
--- a/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.jelly
+++ b/core/src/main/resources/hudson/model/PermalinkProjectAction/Permalink/link.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
   <j:set var="b" value="${it.resolve(job)}"/>
   <j:if test="${b!=null}">
     <li>
-      <a class="model-link tl-tr" href="${it.id}/">${%format(it.displayName,b.displayName,b.timestampString)}</a>
+      <a class="model-link inside tl-tr" href="${it.id}/">${%format(it.displayName,b.displayName,b.timestampString)}</a>
     </li>
   </j:if>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/RunParameterValue/value.jelly b/core/src/main/resources/hudson/model/RunParameterValue/value.jelly
index be8387bb04164e067aae34167f45e1a4c8e4d489..5191c4d38b6fcf6e79513f07bbb7db5982808c05 100755
--- a/core/src/main/resources/hudson/model/RunParameterValue/value.jelly
+++ b/core/src/main/resources/hudson/model/RunParameterValue/value.jelly
@@ -27,6 +27,6 @@ THE SOFTWARE.
 	xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"
 	xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
 	<f:entry title="${it.name}" description="${it.description}">
-		<a href="${rootURL}/${it.run.url}" class="model-link">${it.run}</a>
+		<a href="${rootURL}/${it.run.url}" class="model-link inside">${it.run}</a>
 	</f:entry>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
index 79429bdacf1d71fc2c3e76848f68b18e72623039..649eaabaa5c81c5296a6ab5eca2b10d9f75868bf 100644
--- a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
+++ b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
@@ -50,7 +50,7 @@ THE SOFTWARE.
                   var d = document.createElement('td');
                   var a = document.createElement('a');
                   a.href = '${rootURL}/' + e.url;
-                  a.className = 'model-link';
+                  a.className = 'model-link inside';
                   var i = document.createElement('img');
                   i.src = e.avatar;
                   i.className = 'icon${iconSize}';
@@ -81,7 +81,7 @@ THE SOFTWARE.
                   if (e.projectUrl != null) {
                       a = document.createElement('a');
                       a.href = '${rootURL}/' + e.projectUrl;
-                      a.className = 'model-link';
+                      a.className = 'model-link inside';
                       a.appendChild(document.createTextNode(e.projectFullDisplayName));
                       d.appendChild(a);
                   }
diff --git a/core/src/main/resources/hudson/scm/SCM/project-changes.jelly b/core/src/main/resources/hudson/scm/SCM/project-changes.jelly
index 6068831f88f8a0974e15aa36a6a643c11506120b..654932227d71eeb0c526e3ca8373b90cb015bf8e 100644
--- a/core/src/main/resources/hudson/scm/SCM/project-changes.jelly
+++ b/core/src/main/resources/hudson/scm/SCM/project-changes.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
 
                 &#8212;
 
-                <a href="${rootURL}/${c.author.url}/" class="model-link">${c.author}</a> /
+                <a href="${rootURL}/${c.author.url}/" class="model-link inside">${c.author}</a> /
 
                 <j:set var="cslink" value="${browser.getChangeSetLink(c)}"/>
                 <j:choose>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
index 7c811cf0d2f48f969d11dbcfd9d4e4dee348a8d9..44c1e6613887e05122f315b2dade5808c05176e4 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -39,7 +39,7 @@ THE SOFTWARE.
         </tr>
         <j:forEach var="user" items="${it.allUsers}">
           <tr>
-            <td><a href="${user.url}/" class="model-link"><img src="${h.getUserAvatar(user,'32x32')}" alt="" height="32" width="32"/></a></td>
+            <td><a href="${user.url}/" class="model-link inside"><img src="${h.getUserAvatar(user,'32x32')}" alt="" height="32" width="32"/></a></td>
             <td><a href="${user.url}/">${user.id}</a></td>
             <td><a href="${user.url}/">${user}</a></td>
             <td>
diff --git a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly
index b3114099e8af690252c89904c0b09e8637571722..f7c2480ec0a92f575d7de9eba6886fdca10e5e0d 100644
--- a/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly
+++ b/core/src/main/resources/hudson/tasks/junit/CaseResult/list.jelly
@@ -41,11 +41,10 @@ THE SOFTWARE.
         <j:if test="${test != null}">
           <tr>
             <td class="pane">
-              <a href="${app.rootUrl}${b.url}testReport${p.url}" class="model-link">${b.fullDisplayName}</a>
-              <st:nbsp/>
-            <j:forEach var="badge" items="${test.testActions}">
-              <st:include it="${badge}" page="badge.jelly" optional="true"/>
-            </j:forEach>
+              <a href="${app.rootUrl}${b.url}testReport${p.url}" class="model-link inside">${b.fullDisplayName}</a>
+              <j:forEach var="badge" items="${test.testActions}">
+                <st:include it="${badge}" page="badge.jelly" optional="true"/>
+              </j:forEach>
             </td>
             <td class="pane" style="text-align:left"><j:out value="${test.description}"/></td>
             <td class="pane" style="text-align:left" data="${test.duration}">${test.durationString}</td>
diff --git a/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly b/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly
index 6393a10968bd0c3a4b2bd563167b35f1acb665f7..2c6b7b5dd12f6170e5f20755c84381134c1d4a91 100644
--- a/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly
+++ b/core/src/main/resources/hudson/tasks/junit/ClassResult/body.jelly
@@ -36,8 +36,7 @@ THE SOFTWARE.
         <j:forEach var="p" items="${it.children}" varStatus="status">
           <tr>
             <td class="pane">
-              <a href="${p.safeName}" class="model-link"><span style="${p.previousResult==null?'font-weight:bold':''}"><st:out value="${p.name}" /></span></a>
-              <st:nbsp/>
+              <a href="${p.safeName}" class="model-link inside"><span style="${p.previousResult==null?'font-weight:bold':''}"><st:out value="${p.name}" /></span></a>
               <j:forEach var="badge" items="${p.testActions}">
                 <st:include it="${badge}" page="badge.jelly" optional="true"/>
               </j:forEach>
diff --git a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly
index 65b3b48369b2919f12902fad89d1070f71ae0449..918183b925947bc17887ed8eaaa371fbe07e3f57 100644
--- a/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly
+++ b/core/src/main/resources/hudson/tasks/junit/ClassResult/list.jelly
@@ -41,10 +41,9 @@ THE SOFTWARE.
           <tr>
             <td class="pane">
             	<a href="${app.rootUrl}${b.url}testReport${p.url}" class="model-link">${b.fullDisplayName}</a>
-	          	<st:nbsp/>
-		        <j:forEach var="badge" items="${p.testActions}">
-		          <st:include it="${badge}" page="badge.jelly" optional="true"/>
-		        </j:forEach>
+              <j:forEach var="badge" items="${p.testActions}">
+                <st:include it="${badge}" page="badge.jelly" optional="true"/>
+              </j:forEach>
             </td>
             <td class="pane" style="text-align:right"><j:out value="${p.description}"/></td>
             <td class="pane" style="text-align:right" data="${p.duration}">${p.durationString}</td>
diff --git a/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index.jelly b/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index.jelly
index 2863b1e0db47ad9c17847703b599a129f74d5601..81db55f00156fe05010b92867e215fd085310d7f 100644
--- a/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index.jelly
+++ b/core/src/main/resources/hudson/tasks/test/AggregatedTestResultPublisher/TestResultAction/index.jelly
@@ -61,7 +61,7 @@ THE SOFTWARE.
             <j:forEach var="i" items="${it.didntRun}">
               <tr>
                 <td class="pane">
-                  <a href="${rootURL}/${i.url}" class="model-link">${i.fullDisplayName}</a>
+                  <a href="${rootURL}/${i.url}" class="model-link inside">${i.fullDisplayName}</a>
                   (${%test result not available})
                 </td>
                 <td class="pane">
@@ -75,7 +75,7 @@ THE SOFTWARE.
             <j:forEach var="i" items="${it.noFingerprints}">
               <tr>
                 <td class="pane">
-                  <a href="${rootURL}/${i.url}" class="model-link">${i.fullDisplayName}</a>
+                  <a href="${rootURL}/${i.url}" class="model-link inside">${i.fullDisplayName}</a>
                   (${%last successful job is not fingerprinted})
                 </td>
                 <td class="pane">
diff --git a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly b/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
index 4ceb56924037982191736e321645a24de5292fae..3444efe3ea35dea11cbe6214038529ecc8b95b04 100644
--- a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
+++ b/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
@@ -42,7 +42,7 @@ THE SOFTWARE.
         <j:forEach var="report" items="${it.childReports}">
           <tr>
             <td class="pane">
-              <a href="../${report.child.project.shortUrl}testReport" class="model-link">${report.child.project.name}</a>
+              <a href="../${report.child.project.shortUrl}testReport" class="model-link inside">${report.child.project.name}</a>
             </td>
             <td data="${report.result.duration}" class="pane" style="text-align:right">
               ${report.result.durationString}
@@ -74,7 +74,7 @@ THE SOFTWARE.
 
           <h3>
             <a name="${report.child.project.name}"/>
-            <a href="../${report.child.project.shortUrl}testReport" class="model-link">${report.child.project.name}</a>
+            <a href="../${report.child.project.shortUrl}testReport" class="model-link inside">${report.child.project.name}</a>
           </h3>
 
           <table class="pane sortable">
@@ -86,12 +86,11 @@ THE SOFTWARE.
             <j:forEach var="f" items="${report.result.failedTests}" varStatus="i">
               <tr>
                 <td class="pane">
-                  <a href="../${report.child.project.shortUrl}testReport/${f.getRelativePathFrom(report.result)}" class="model-link">
+                  <a href="../${report.child.project.shortUrl}testReport/${f.getRelativePathFrom(report.result)}" class="model-link inside">
                     <st:out value="${f.fullName}"/>
-		          	<st:nbsp/>
-			        <j:forEach var="badge" items="${f.testActions}">
-			          <st:include it="${badge}" page="badge.jelly" optional="true"/>
-			        </j:forEach>
+                    <j:forEach var="badge" items="${f.testActions}">
+                      <st:include it="${badge}" page="badge.jelly" optional="true"/>
+                    </j:forEach>
                   </a>
                 </td>
                 <td class="pane" style="text-align:right;">
diff --git a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly
index bd0998f619d8212f482a53405cc0fb0fc8b2ed29..ab82ece584de7fe3dec239f9989385a73d4f98f4 100644
--- a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly
+++ b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/body.jelly
@@ -63,8 +63,7 @@ THE SOFTWARE.
             <a id="test-${f.fullName}-hidelink" style="display:none"
                href="javascript:hideStackTrace('test-${h.jsStringEscape(f.fullName)}')">&lt;&lt;&lt;</a>
             <st:nbsp/>
-            <a href="${f.getRelativePathFrom(it)}" class="model-link"><st:out value="${f.fullName}"/></a>
-            <st:nbsp/>
+            <a href="${f.getRelativePathFrom(it)}" class="model-link inside"><st:out value="${f.fullName}"/></a>
             <j:forEach var="badge" items="${f.testActions}">
               <st:include it="${badge}" page="badge.jelly" optional="true"/>
             </j:forEach>
@@ -77,7 +76,7 @@ THE SOFTWARE.
             ${f.durationString}
           </td>
           <td class="pane" style="text-align:right;">
-            <a href="${rootURL}/${f.failedSinceRun.url}" class="model-link">${f.age}</a>
+            <a href="${rootURL}/${f.failedSinceRun.url}" class="model-link inside">${f.age}</a>
           </td>
         </tr>
       </j:forEach>
@@ -103,11 +102,10 @@ THE SOFTWARE.
           <j:set var="prev" value="${prevAll.findCorrespondingResult(p.id)}" />
           <tr>
             <td class="pane">
-              <a href="${p.safeName}/" class="model-link"><span style="${prev==null?'font-weight:bold':''}"><st:out value="${p.name}" /></span></a>
-                <st:nbsp/>
-                <j:forEach var="badge" items="${p.testActions}">
-                  <st:include it="${badge}" page="badge.jelly" optional="true"/>
-                </j:forEach>
+              <a href="${p.safeName}/" class="model-link inside"><span style="${prev==null?'font-weight:bold':''}"><st:out value="${p.name}" /></span></a>
+              <j:forEach var="badge" items="${p.testActions}">
+                <st:include it="${badge}" page="badge.jelly" optional="true"/>
+              </j:forEach>
             </td>
             <td class="pane" style="text-align:right" data="${p.duration}">${p.durationString}</td>
             <td class="pane" style="text-align:right">${p.failCount}</td>
diff --git a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly
index 3dcaf05b1a62a54421d78c7f0f2dea0bf3c6262f..df754d1cf1c7d7056f3e1b4dcaea23e15fa8fb2f 100644
--- a/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly
+++ b/core/src/main/resources/hudson/tasks/test/MetaTabulatedResult/list.jelly
@@ -41,10 +41,9 @@ THE SOFTWARE.
           <tr>
             <td class="pane">
             	<a href="${app.rootUrl}${b.url}testReport${p.url}" class="model-link">${b.fullDisplayName}</a>
-	          	<st:nbsp/>
-		        <j:forEach var="badge" items="${p.testActions}">
-		          <st:include it="${badge}" page="badge.jelly" optional="true"/>
-		        </j:forEach>
+              <j:forEach var="badge" items="${p.testActions}">
+                <st:include it="${badge}" page="badge.jelly" optional="true"/>
+              </j:forEach>
             </td>
             <td class="pane" style="text-align:right"><j:out value="${p.description}"/></td>
             <td class="pane" style="text-align:right" data="${p.duration}">${p.durationString}</td>
diff --git a/core/src/main/resources/hudson/views/JobColumn/column.jelly b/core/src/main/resources/hudson/views/JobColumn/column.jelly
index 4296af98636f85a1dbf0f930b3883f6f957797c6..116ca8d108cf7cc2dd1b16db7539d5e21885d1eb 100644
--- a/core/src/main/resources/hudson/views/JobColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/JobColumn/column.jelly
@@ -25,6 +25,6 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
     <td style="${indenter.getCss(job)}">
-        <a href="${jobBaseUrl}${job.shortUrl}" class='model-link'> ${h.getRelativeDisplayNameFrom(job,currentView.owner.itemGroup)}</a>
+        <a href="${jobBaseUrl}${job.shortUrl}" class='model-link inside'> ${h.getRelativeDisplayNameFrom(job,currentView.owner.itemGroup)}</a>
     </td>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly
index c00c364c1619afafdda92f5b1e7ac0c75395894e..43544f10bb35d5ffe3f5c49ff4ee50b66373dbdb 100644
--- a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <j:choose>
       <j:when test="${lfBuild!=null}">
         ${lfBuild.timestampString}
-        (<a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/" class="model-link">${lfBuild.displayName}</a>)
+        - <a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/" class="model-link inside">${lfBuild.displayName}</a>
       </j:when>
       <j:otherwise>
         ${%N/A}
diff --git a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly
index eb37c7d8e822da2ae42353eadd402e80c13ef61b..6700bd42d65e23bae0aa10f854e47eed33e92f22 100644
--- a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <j:choose>
       <j:when test="${lstBuild!=null}">
         ${lstBuild.timestampString}
-        (<a href="${jobBaseUrl}${job.shortUrl}lastStableBuild/" class="model-link">${lstBuild.displayName}</a>)
+        - <a href="${jobBaseUrl}${job.shortUrl}lastStableBuild/" class="model-link inside">${lstBuild.displayName}</a>
       </j:when>
       <j:otherwise>
         ${%N/A}
diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly
index a3e6e3041c77f860efaa88b490f99745995c2c3d..bed1c1363c15901c5ea49d9ad1a5252227b120f6 100644
--- a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <j:choose>
       <j:when test="${lsBuild!=null}">
         ${lsBuild.timestampString}
-        (<a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/" class="model-link">${lsBuild.displayName}</a>)
+        - <a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/" class="model-link inside">${lsBuild.displayName}</a>
       </j:when>
       <j:otherwise>
         ${%N/A}
diff --git a/core/src/main/resources/lib/hudson/abstractItemLink.jelly b/core/src/main/resources/lib/hudson/abstractItemLink.jelly
index 6589f8f8577c8076237099a0dac6094654b05629..554fc44f1e10eb9a8be6dc23ebc577de8c7ec03e 100644
--- a/core/src/main/resources/lib/hudson/abstractItemLink.jelly
+++ b/core/src/main/resources/lib/hudson/abstractItemLink.jelly
@@ -29,5 +29,5 @@ THE SOFTWARE.
     Displays a link when given an AbstractItem. It is assumed that that Abstract
     Item is passed in ${it}
   </st:documentation>  
-  <a href="${it.absoluteUrl}"  class="model-link">${it.displayName}</a>
+  <a href="${it.absoluteUrl}"  class="model-link inside">${it.displayName}</a>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly
index 883c10aa16a869291f39daac788815b41984f6c1..36d859fa6c3711665f0dd6638789e02ad703ce49 100644
--- a/core/src/main/resources/lib/hudson/buildListTable.jelly
+++ b/core/src/main/resources/lib/hudson/buildListTable.jelly
@@ -47,7 +47,7 @@ THE SOFTWARE.
     <j:forEach var="b" items="${h.subList(attrs.builds,50)}">
       <tr>
         <td data="${b.iconColor.ordinal()}">
-          <a href="${jobBaseUrl}${b.url}" class="model-link">
+          <a href="${jobBaseUrl}${b.url}">
             <img src="${imagesURL}/${iconSize}/${b.buildStatusUrl}"
                  alt="${b.iconColor.description}" class="icon${iconSize}"/>
           </a>
@@ -55,7 +55,7 @@ THE SOFTWARE.
         <td>
           <a href="${jobBaseUrl}${b.parent.url}" class="model-link">${b.parent.fullDisplayName}</a>
           <st:nbsp/>
-          <a href="${jobBaseUrl}${b.url}" class="model-link">${b.displayName}</a>
+          <a href="${jobBaseUrl}${b.url}" class="model-link inside">${b.displayName}</a>
         </td>
         <td data="${b.timestampString2}" tooltip="${%Click to center timeline on event}" onclick="javascript:tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime('${b.timestampString2}'))">
           ${b.timestampString}
diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index e35e4d2832f28d6ccc36baaf55b1d2c179fae4b3..9ad0e67fabc22999de53fd87e0495c82d8eef8d5 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
   </st:documentation>
   <d:taglib uri="local">
     <d:tag name="computerCaption">
-      <a href="${rootURL}/${c.url}" class="model-link">${title}</a>
+      <a href="${rootURL}/${c.url}" class="model-link inside">${title}</a>
       <j:if test="${c.offline}"> <st:nbsp/> (${%offline})</j:if>
       <j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
     </d:tag>
@@ -57,7 +57,7 @@ THE SOFTWARE.
                 <td class="pane">
                   <j:choose>
                     <j:when test="${c.offline}">
-                      <a href="${rootURL}/${c.url}" class="model-link">${%Offline}</a>
+                      <a href="${rootURL}/${c.url}" class="model-link inside">${%Offline}</a>
                     </j:when>
                     <j:otherwise>
                       ${%Idle}
@@ -79,7 +79,7 @@ THE SOFTWARE.
                       </j:invokeStatic>
                       <j:choose>
                         <j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
-                          <a href="${rootURL}/${exeparent.url}" class="model-link">${exeparent.fullDisplayName}</a>&#160;<a href="${rootURL}/${exe.url}" class="model-link">#${exe.number}</a>
+                          <a href="${rootURL}/${exeparent.url}">${exeparent.fullDisplayName}</a>&#160;<a href="${rootURL}/${exe.url}" class="model-link inside">#${exe.number}</a>
                           <t:buildProgressBar build="${exe}" executor="${executor}"/>
                         </j:when>
                         <j:otherwise>
diff --git a/core/src/main/resources/lib/hudson/node.jelly b/core/src/main/resources/lib/hudson/node.jelly
index 1e1eae0521cfe4ce5dd01b6e2cf968a92ea932d9..d6a74ede8b7f6e8e4f90981291b3cedafb9ee2f4 100644
--- a/core/src/main/resources/lib/hudson/node.jelly
+++ b/core/src/main/resources/lib/hudson/node.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
   </st:documentation>
   <j:choose>
     <j:when test="${value!=null and value!=app}">
-      <a href="${rootURL}/computer/${value.nodeName}" class="model-link">${value.nodeName}</a>
+      <a href="${rootURL}/computer/${value.nodeName}" class="model-link inside">${value.nodeName}</a>
     </j:when>
     <j:when test="${valueStr != null and valueStr != ''}">
       ${valueStr}
diff --git a/core/src/main/resources/lib/hudson/project/build-permalink.jelly b/core/src/main/resources/lib/hudson/project/build-permalink.jelly
index 484c00b960cbdb53164a6d88d19b1a1aa9574126..2c28aff1ee1b6c15d9ea50f694ac7c4f6b972025 100644
--- a/core/src/main/resources/lib/hudson/project/build-permalink.jelly
+++ b/core/src/main/resources/lib/hudson/project/build-permalink.jelly
@@ -36,7 +36,7 @@ THE SOFTWARE.
   <j:set var="b" value="${it[property]}"/>
   <j:if test="${b!=null}">
     <li>
-      <a href="${property}/" class="model-link">${%format(title,b.number,b.timestampString)}</a>
+      <a href="${property}/" class="model-link inside">${%format(title,b.number,b.timestampString)}</a>
     </li>
   </j:if>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/projectViewNested.jelly b/core/src/main/resources/lib/hudson/projectViewNested.jelly
index 15f511baa5d2cb1c1caa2b4bbe4c8527c3a8f3d1..1dc5044c531bea844b9132f585bf30486ff9a790 100644
--- a/core/src/main/resources/lib/hudson/projectViewNested.jelly
+++ b/core/src/main/resources/lib/hudson/projectViewNested.jelly
@@ -48,7 +48,7 @@ THE SOFTWARE.
       </div>
     </td>
     <td colspan="5" style="${indenter.getCss(job)}">
-      <a href="${rootURL}/${v.url}" class="model-link">
+      <a href="${rootURL}/${v.url}" class="model-link inside">
         ${v.viewName}
       </a>
     </td>
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
index 4e38a1f890ae8a427e343d83587be064740036b7..7f5488444d68b529f27e5852169aab4e1a4fbb55 100644
--- a/core/src/main/resources/lib/hudson/queue.jelly
+++ b/core/src/main/resources/lib/hudson/queue.jelly
@@ -62,7 +62,7 @@ THE SOFTWARE.
               <j:set var="stuck" value="${item.isStuck()}"/>
               <j:choose>
                 <j:when test="${h.hasPermission(item.task,item.task.READ)}">
-                  <a href="${rootURL}/${item.task.url}" class="model-link tl-tr" tooltip="${item.why}${h.escape(item.params)}&lt;br&gt;${%WaitingFor(item.inQueueForString)}">
+                  <a href="${rootURL}/${item.task.url}" class="model-link inside tl-tr" tooltip="${item.why}${h.escape(item.params)}&lt;br&gt;${%WaitingFor(item.inQueueForString)}">
                     ${item.task.fullDisplayName}
                   </a>
                   <!-- XXX include estimated number as in BuildHistoryWidget/entries.jelly if possible -->
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 941b98e257502aba1901b263c6a3198fa709960b..e9a053ea4887b3bb6da108e50122c8910bdae110 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -184,7 +184,7 @@ ${h.initPageVariables(context)}
                 <j:choose>
                   <j:when test="${!h.isAnonymous()}">
                     <span style="white-space:nowrap">
-                      <a href="${rootURL}/user/${app.authentication.name}" class="model-link"><b>${app.authentication.name}</b></a>
+                      <a href="${rootURL}/user/${app.authentication.name}" class="model-link inside"><b>${app.authentication.name}</b></a>
                       <j:if test="${app.securityRealm.canLogOut()}">
                         |
                         <a href="${rootURL}/logout"><b>${%logout}</b></a>