diff --git a/js/importers/importer-passmanjson.js b/js/importers/importer-passmanjson.js
index 6f32ceda..ab9a4856 100644
--- a/js/importers/importer-passmanjson.js
+++ b/js/importers/importer-passmanjson.js
@@ -42,7 +42,7 @@ var PassmanImporter = PassmanImporter || {};
 				var item = parsed_json[i];
 				var _credential = PassmanImporter.newCredential();
 				_credential.label = item.label;
-				_credential.username = item.account;
+				_credential.username = item.username;
 				_credential.password = item.password;
 				_credential.email = item.email;
 				_credential.url = item.url;
diff --git a/sass/credentials.scss b/sass/credentials.scss
index d816d5d5..59011a72 100644
--- a/sass/credentials.scss
+++ b/sass/credentials.scss
@@ -541,12 +541,12 @@
 
     }
     white-space: nowrap;
-    overflow: hidden;
     text-overflow: ellipsis;
-    max-width: 70%;
+    max-width: 100%;
   }
   .tools {
     margin-left: 10px;
+    margin-top: 8px;
     overflow: hidden;
     float: left;
     .cell {
diff --git a/sass/public-page.scss b/sass/public-page.scss
index 88873b46..49a5c093 100644
--- a/sass/public-page.scss
+++ b/sass/public-page.scss
@@ -30,6 +30,16 @@ header {
   padding-top: 0;
 }
 
+.share-controller{
+  width: 100%;
+  .share-container{
+    margin-top: 50px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 25%;
+  }
+}
+
 .credential_container{
   margin-top: 20px;
   margin-bottom: 20px;
@@ -45,6 +55,7 @@ header {
   }
   button, .text{
     margin: 0 auto;
+    margin-bottom: 25px;
     display: block;
     i{
       margin-right: 5px;
diff --git a/sass/share_credential.scss b/sass/share_credential.scss
index 13eb11ad..0a2c96c3 100644
--- a/sass/share_credential.scss
+++ b/sass/share_credential.scss
@@ -22,6 +22,10 @@
 
 .sharing_table {
 
+  .button{
+    min-height: 42px;
+    margin: 5px 0 0 0;
+  }
 
   td:first-child {
     width: 55%;
@@ -52,6 +56,10 @@
   }
 }
 .shared_table {
+  .pending{
+    margin-right: 10px;
+  }
+
   .fa-trash {
     cursor: pointer;
   }
diff --git a/templates/public_share.php b/templates/public_share.php
index b88b9acf..400eca26 100644
--- a/templates/public_share.php
+++ b/templates/public_share.php
@@ -66,8 +66,9 @@ style('passman', 'app');
 style('passman', 'public-page');
 
 ?>
-<div ng-app="passmanApp" ng-controller="PublicSharedCredential">
-	<div class="row">
+<div class="share-controller" ng-app="passmanApp" ng-controller="PublicSharedCredential">
+	<div class="share-container">
+        <div class="row">
 		<div class="col-xs-8 col-xs-push-2 col-xs-pull-2 credential_container">
 			<h2>Passman</h2>
 			<div ng-if="!shared_credential && !expired">
@@ -204,4 +205,5 @@ style('passman', 'public-page');
 			</div>
 		</div>
 	</div>
+    </div>
 </div>
diff --git a/templates/views/partials/forms/share_credential/basics.html b/templates/views/partials/forms/share_credential/basics.html
index 8774998d..ba5a68d0 100644
--- a/templates/views/partials/forms/share_credential/basics.html
+++ b/templates/views/partials/forms/share_credential/basics.html
@@ -78,7 +78,7 @@
 					<i class="fa fa-user" ng-if="user.pending === false"></i>
 					<i class="fa fa-user-times" ng-if="user.pending === true"></i>
 					{{user.userId}}
-					<small ng-if="user.pending === true" class="pull-right col-xs-4">{{ 'pending' | translate}}</small>
+					<small ng-if="user.pending === true" class="pull-right pending">{{ 'pending' | translate}}</small>
 				</td>
 				<td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.READ)" ng-checked="hasPermission(user.acl, default_permissions.permissions.READ)"> </td>
 				<td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.WRITE)" ng-checked="hasPermission(user.acl, default_permissions.permissions.WRITE)"></td>