diff --git a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.java b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.java
index ef8c8768c87..653ee46e419 100644
--- a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.java
+++ b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.java
@@ -16,18 +16,8 @@
 
 package org.kie.workbench.common.widgets.metadata.client.widget;
 
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.KeyUpEvent;
-import com.google.gwt.event.dom.client.KeyUpHandler;
-import com.google.gwt.uibinder.client.UiBinder;
-import com.google.gwt.uibinder.client.UiField;
-import com.google.gwt.uibinder.client.UiHandler;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.InlineLabel;
-import com.google.gwt.user.client.ui.PushButton;
-import com.google.gwt.user.client.ui.Widget;
+import static org.uberfire.commons.validation.PortablePreconditions.checkNotNull;
+
 import org.guvnor.common.services.shared.metadata.model.Metadata;
 import org.gwtbootstrap3.client.ui.FormControlStatic;
 import org.gwtbootstrap3.client.ui.TextBox;
@@ -39,7 +29,17 @@
 import org.uberfire.ext.widgets.common.client.common.popups.YesNoCancelPopup;
 import org.uberfire.mvp.Command;
 
-import static org.uberfire.commons.validation.PortablePreconditions.*;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.KeyUpEvent;
+import com.google.gwt.event.dom.client.KeyUpHandler;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.PushButton;
+import com.google.gwt.user.client.ui.Widget;
 
 /**
  * This displays the metadata for a versionable artifact. It also captures
@@ -77,7 +77,7 @@ interface Binder
     @UiField
     TextBox source;
     @UiField
-    InlineLabel lockedBy;
+    FormControlStatic lockedBy;
     @UiField
     PushButton unlock;
 
@@ -154,7 +154,8 @@ private void setLockStatus() {
         Image unlockImage = new Image( ImageResources.INSTANCE.unlock() );
         unlock.setHTML( "<span>" + unlockImage.toString() + " " + unlock.getText() + "</span>" );
         unlock.getElement().setAttribute( "data-uf-lock", "false" );
-        unlock.setEnabled( lockInfo.isLocked() );
+        unlock.setVisible( lockInfo.isLocked() );
+        unlock.setEnabled( true );
     }
 
     @Deprecated
diff --git a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.ui.xml b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.ui.xml
index e9faeb3352e..612caf9f316 100644
--- a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.ui.xml
+++ b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/MetadataWidget.ui.xml
@@ -25,7 +25,6 @@
     <ui:with field="i18n" type="org.kie.workbench.common.widgets.metadata.client.resources.i18n.MetadataConstants"/>
 
     <ui:style>
-
         .firstColumn {
             float: left;
             width: 120px;
@@ -33,6 +32,7 @@
 
         .forceUnlock {
             display: inline-block;
+            padding-right: 5px;
         }
     </ui:style>
 
@@ -86,8 +86,8 @@
                         <b:FormGroup>
                             <b:FormLabel text="{i18n.LockMetaData}" addStyleNames="col-md-2"/>
                             <b:Column size="MD_5">
-                                <gwt:InlineLabel ui:field="lockedBy" text='{i18n.LockedByHint}'/>
-                                <gwt:PushButton addStyleNames="{style.forceUnlock}" ui:field="unlock" text='{i18n.ForceUnlockCaption}'/>
+                            	<b:FormControlStatic addStyleNames="{style.forceUnlock}" ui:field="lockedBy" />
+                                <gwt:PushButton addStyleNames="btn btn-default {style.forceUnlock}" ui:field="unlock" text='{i18n.ForceUnlockCaption}'/>
                             </b:Column>
                         </b:FormGroup>
                     </b:FieldSet>
diff --git a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/TagWidgetViewImpl.ui.xml b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/TagWidgetViewImpl.ui.xml
index cf394185485..ad073c726ec 100644
--- a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/TagWidgetViewImpl.ui.xml
+++ b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/java/org/kie/workbench/common/widgets/metadata/client/widget/TagWidgetViewImpl.ui.xml
@@ -23,12 +23,18 @@
 
   <ui:with field="i18n" type="org.kie.workbench.common.widgets.metadata.client.resources.i18n.MetadataConstants"/>
 
+  <ui:style>
+      .newTag {
+           margin-right: 5px;	  
+      }
+  </ui:style>
+  
   <gwt:FlowPanel>
     <gwt:HorizontalPanel ui:field="tags">
     </gwt:HorizontalPanel>
-    <b:Form type="HORIZONTAL">
-      <b:TextBox name="newTags" ui:field="newTags"/>
-      <b:Button ui:field="addTags" type="PRIMARY" text="{i18n.AddNewTag}"></b:Button>
+    <b:Form type="INLINE">
+      <b:TextBox name="newTags" ui:field="newTags" addStyleNames="{style.newTag}" />
+      <b:Button ui:field="addTags" text="{i18n.AddNewTag}"></b:Button>
     </b:Form>
   </gwt:FlowPanel>
 
diff --git a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/resources/org/kie/workbench/common/widgets/metadata/client/resources/i18n/MetadataConstants.properties b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/resources/org/kie/workbench/common/widgets/metadata/client/resources/i18n/MetadataConstants.properties
index adc10425416..fb9af06d0f0 100644
--- a/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/resources/org/kie/workbench/common/widgets/metadata/client/resources/i18n/MetadataConstants.properties
+++ b/kie-wb-common-widgets/kie-wb-metadata-widget/src/main/resources/org/kie/workbench/common/widgets/metadata/client/resources/i18n/MetadataConstants.properties
@@ -55,8 +55,8 @@ LockMetaData=Lock status:
 LockedByHint=Locked by
 UnlockedHint=Not locked
 ForceUnlockCaption=Force unlock asset
-TagsMetaData=Tags
-AddNewTag=Add a new tag/s
+TagsMetaData=Tags:
+AddNewTag=Add new tag(s)
 RemoveThisTag=Remove this tag
 ForceUnlockConfirmationTitle=Confirmation
 ForceUnlockConfirmationText=Are you sure you want to release the lock of this asset? This might cause {0} to lose unsaved changes!