diff --git a/scripts/app-bundle.js b/scripts/app-bundle.js
index 1d081dc..abc2e4f 100644
--- a/scripts/app-bundle.js
+++ b/scripts/app-bundle.js
@@ -11972,32 +11972,32 @@ var Dropdown = function () {
 
 define('text!app.html', ['module'], function(module) { module.exports = "<template><require from=\"./styles.css\"></require><require from=\"./resources/elements/nav-bar\"></require><nav class=\"navbar navbar-expand-lg navbar-light bg-light\"><a class=\"navbar-brand\" href=\"#\">${ 'shell:SiteName' | t}</a></nav><div class=\"container-fluid\"><div class=\"row\"><div class=\"card col-sm-5 col-md-4 col-lg-3 bg-faded\"><div class=\"just-padding\"><nav-bar navigation.bind=\"groupedNavigation\"></nav-bar></div></div><div class=\"col col-xs\"><router-view class=\"row\"></router-view></div></div></div></template>"; });
 define('text!challenges/challenge.edit.html', ['module'], function(module) { module.exports = "<template><div class=\"form-group\"><label>${'claim:selectClaim' | t}</label><select class=\"form-control\" value.bind=\"contract.actor\"><option model.bind=\"null\">${'claim:defaultOption' | t}</option><option repeat.for=\"actorOption of actorOptions\" model.bind=\"actorOption\">${actorOption.name | t}</option></select></div></template>"; });
-define('text!challenges/challenge.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'user:name'|t}<i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl></template>"; });
+define('text!challenges/challenge.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa fa-user\"></i> ${'user:name'|t}</dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl></template>"; });
 define('text!challenges/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:createChallenge'|t}</h4><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
 define('text!citations/citation.edit.html', ['module'], function(module) { module.exports = "<template><div class=\"form-group\"><label>${'citation:selectClaim' | t}</label><select class=\"form-control\" value.bind=\"contract.actor\"><option model.bind=\"null\">${'citation:defaultOption' | t}</option><option repeat.for=\"actorOption of actorOptions\" model.bind=\"actorOption\">${actorOption.name | t}</option></select></div></template>"; });
-define('text!citations/citation.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'user:name'|t}<i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl></template>"; });
+define('text!citations/citation.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa fa-user\"></i> ${'user:name'|t}</dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl></template>"; });
 define('text!citations/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:createCitation'|t}</h4><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
 define('text!claims/claim.edit.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/markdown\"></require><div class=\"form-group\"><label>${'claim:question'|t}</label><span class=\"form-control disabled\">${contract.question.title}</span></div><div class=\"form-group\"><label>${'claim:selectUser' | t}</label><select class=\"form-control\" value.bind=\"contract.actor\"><option model.bind=\"null\">${'claim:defaultOption' | t}</option><option repeat.for=\"actorOption of actorOptions\" model.bind=\"actorOption\">${actorOption.name | t}</option></select></div><div class=\"form-group\"><label>${'claim:enterTitle' | t}</label><input class=\"form-control\" type=\"text\" value.bind=\"contract.title\"></div><div class=\"form-group\"><label>${'claim:enterClaim' | t}</label><textarea class=\"form-control\" value.bind=\"contract.content\"></textarea></div><label>${'claim:previewClaim' | t}</label><markdown value.bind=\"contract.content\"></markdown></template>"; });
-define('text!claims/claim.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><require from=\"../resources/elements/markdown\"></require><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'claim:title'|t} <i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\">${contract.title}</dd></dl><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'claim:claim'|t} <i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\"><markdown value.bind=\"contract.content\"></markdown></dd></dl></template>"; });
+define('text!claims/claim.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><require from=\"../resources/elements/markdown\"></require><dl class=\"row\"><dt class=\"col-sm-5\"><i class=\"ml-1 fa fa-bullhorn\"></i> ${'claim:title'|t}</dt><dd class=\"col-sm-7\">${contract.title}</dd></dl><dl class=\"row\"><dt class=\"col-sm-5\"><i class=\"ml-1 fa fa-newspaper-o\"></i> ${'claim:claim'|t}</dt><dd class=\"col-sm-7\"><markdown value.bind=\"contract.content\"></markdown></dd></dl></template>"; });
 define('text!claims/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:createClaim'|t}</h4><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
 define('text!federations/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:createFederation'|t}</h4><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
 define('text!federations/federation.edit.html', ['module'], function(module) { module.exports = "<template><div class=\"form-group\"><label>${'federation:selectClaim' | t}</label><select class=\"form-control\" value.bind=\"contract.actor\"><option model.bind=\"null\">${'federation:defaultOption' | t}</option><option repeat.for=\"actorOption of actorOptions\" model.bind=\"actorOption\">${actorOption.name | t}</option></select></div></template>"; });
-define('text!federations/federation.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'user:name'|t}<i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl></template>"; });
+define('text!federations/federation.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa fa-user\"></i> ${'user:name'|t}</dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl></template>"; });
 define('text!home/index.html', ['module'], function(module) { module.exports = "<template></template>"; });
-define('text!judges/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:createJudge'|t}</h4><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
-define('text!judges/judge.edit.html', ['module'], function(module) { module.exports = "<template><div class=\"form-group\"><label>${'judge:selectUser' | t}</label><select class=\"form-control\" value.bind=\"contract.actor\" matcher.bind=\"contractMatcher\"><option model.bind=\"null\">${'judge:defaultOption' | t}</option><option repeat.for=\"actorOption of actorOptions\" model.bind=\"actorOption\">${actorOption.name | t}</option></select></div><div class=\"form-group\"><label>${'judge:selectJudge' | t}</label><select multiple=\"true\" class=\"form-control\" value.bind=\"contract.appealJudges\" matcher.bind=\"contractMatcher\"><option model.bind=\"null\">${'judge:defaultOption' | t}</option><option repeat.for=\"judgeOption of judgeOptions\" model.bind=\"judgeOption\">${judgeOption.actor.name | t}</option></select></div><div class=\"form-group\"><label>${'judge:selectFederation' | t}</label><select class=\"form-control\" value.bind=\"contract.federation\" matcher.bind=\"contractMatcher\"><option model.bind=\"null\">${'judge:defaultOption' | t}</option><option repeat.for=\"federationOption of federationOptions\" model.bind=\"federationOption\">${federationOption.name | t}</option></select></div></template>"; });
-define('text!judges/judge.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa-fw fa fa-user\"></i> ${'user:name'|t}</dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa-fw fa fa-gavel\"></i> ${'judge:appealJudge'|t}</dt><dd class=\"col-sm-7\"><div repeat.for=\"appealJudge of contract.appealJudges\">${appealJudge.actor.name}</div></dd></dl><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa-fw fa fa-user\"></i> ${'federation:name'|t}</dt><dd class=\"col-sm-7\">${federation.name}</dd></dl></template>"; });
 define('text!keys/create.html', ['module'], function(module) { module.exports = "<template></template>"; });
 define('text!keys/detail.html', ['module'], function(module) { module.exports = "<template></template>"; });
 define('text!keys/index.html', ['module'], function(module) { module.exports = "<template></template>"; });
-define('text!pending/index.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/commit-contract\"></require><template repeat.for=\"contract of contracts\" bindable=\"edit\"><div class=\"col-md-6 mt-1\"><div class=\"modal-content\"><div class=\"modal-header\"><button type=\"button\" class=\"close\" click.delegate=\"edit=!edit\" aria-label.bind=\"edit\"><i class=\"fa ${edit ? 'fa-eye':'fa-edit'}\"></i></button><h5 class=\"modal-title\">${'shell:'+contract.roles.join('.') | t}</h5></div><div class=\"modal-body\"><contract contract.bind=\"contract\" type.bind=\"edit?'edit':'view'\"></contract></div><div class=\"modal-footer\"><commit-contract contract.bind=\"contract\" delete-call-back.bind=\"refresh()\"></commit-contract></div></div></div></template></template>"; });
+define('text!judges/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:createJudge'|t}</h4><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
+define('text!judges/judge.edit.html', ['module'], function(module) { module.exports = "<template><div class=\"form-group\"><label>${'judge:selectUser' | t}</label><select class=\"form-control\" value.bind=\"contract.actor\" matcher.bind=\"contractMatcher\"><option model.bind=\"null\">${'judge:defaultOption' | t}</option><option repeat.for=\"actorOption of actorOptions\" model.bind=\"actorOption\">${actorOption.name | t}</option></select></div><div class=\"form-group\"><label>${'judge:selectJudge' | t}</label><select multiple=\"true\" class=\"form-control\" value.bind=\"contract.appealJudges\" matcher.bind=\"contractMatcher\"><option model.bind=\"null\">${'judge:defaultOption' | t}</option><option repeat.for=\"judgeOption of judgeOptions\" model.bind=\"judgeOption\">${judgeOption.actor.name | t}</option></select></div><div class=\"form-group\"><label>${'judge:selectFederation' | t}</label><select class=\"form-control\" value.bind=\"contract.federation\" matcher.bind=\"contractMatcher\"><option model.bind=\"null\">${'judge:defaultOption' | t}</option><option repeat.for=\"federationOption of federationOptions\" model.bind=\"federationOption\">${federationOption.name | t}</option></select></div></template>"; });
+define('text!judges/judge.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa-fw fa fa-user\"></i> ${'user:name'|t}</dt><dd class=\"col-sm-7\">${contract.actor.name}</dd></dl><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa-fw fa fa-gavel\"></i> ${'judge:appealJudge'|t}</dt><dd class=\"col-sm-7\"><div repeat.for=\"appealJudge of contract.appealJudges\">${appealJudge.actor.name}</div></dd></dl><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa-fw fa fa-user\"></i> ${'federation:name'|t}</dt><dd class=\"col-sm-7\">${federation.name}</dd></dl></template>"; });
 define('text!questions/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:createQuestion'|t}</h4><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
 define('text!questions/question.edit.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/markdown\"></require><div class=\"form-group\"><label>${'question:enterTitle' | t}</label><input class=\"form-control\" type=\"text\" value.bind=\"contract.title\"></div><div class=\"form-group\"><label>${'question:enterQuestion' | t}</label><textarea class=\"form-control\" value.bind=\"contract.content\"></textarea></div><label>${'question:previewQuestion' | t}</label><markdown value.bind=\"contract.content\"></markdown></template>"; });
-define('text!questions/question.view.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/markdown\"></require><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'question:title'|t} <i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\">${contract.title}</dd></dl><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'question:question'|t} <i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\"><markdown value.bind=\"contract.content\"></markdown></dd></dl><dl class=\"row\"><dt class=\"col-sm-8\" for=\"name\"></dt><dd class=\"col-sm-4\"><button class=\"btn btn-outline-success\" type=\"button\" click.trigger=\"answer()\"><span><i class=\"fa fa-bullhorn mr-1\"></i> ${'question:answer' | t}</span></button></dd></dl></template>"; });
+define('text!questions/question.view.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/markdown\"></require><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa fa-question\"></i> ${'question:title'|t}</dt><dd class=\"col-sm-7\">${contract.title}</dd></dl><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa fa-newspaper-o\"></i> ${'question:question'|t}</dt><dd class=\"col-sm-7\"><markdown value.bind=\"contract.content\"></markdown></dd></dl><dl class=\"row\"><dt class=\"col-sm-8\" for=\"name\"></dt><dd class=\"col-sm-4\"><button class=\"btn btn-outline-success\" type=\"button\" click.trigger=\"answer()\"><span><i class=\"fa fa-bullhorn mr-1\"></i> ${'question:answer' | t}</span></button></dd></dl></template>"; });
 define('text!users/create.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/submit-contract\"></require><div class=\"col col-xs\"><div class=\"card card-block\"><form class=\"card-body\"><h4 class=\"card-title\">${'shell:create'|t}</h4><div class=\"form-group\"><label>${'user:selectUserTypeLabel' | t}<br></label><select class=\"form-control\" value.bind=\"selectedUserType\"><option model.bind=\"null\">${'user:defaultOption' | t}</option><option repeat.for=\"actorType of UsersDropDownOptions\" model.bind=\"actorType\">${actorType.displayName | t}</option></select></div><contract contract.bind=\"contract\" type.bind=\"contractType\"></contract><div class=\"form-group\"><div class=\"float-sm-right\"><submit-contract contract.bind=\"contract\" add-new-call-back.bind=\"addNew()\"></submit-contract></div></div></form></div></div></template>"; });
 define('text!users/index.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/commit-contract\"></require><template repeat.for=\"contract of contracts\" bindable=\"edit\"><div class=\"col-md-6 mt-1\"><div class=\"modal-content\"><div class=\"modal-header\"><button type=\"button\" class=\"close\" click.delegate=\"edit=!edit\" aria-label.bind=\"edit\"><i class=\"fa ${edit ? 'fa-eye':'fa-edit'}\"></i></button><h4 class=\"modal-title\">${'shell:'+contract.roles.join('.') | t}</h4></div><div class=\"modal-body\"><contract contract.bind=\"contract\" type.bind=\"edit?'edit':'view'\"></contract></div><div class=\"modal-footer\"><commit-contract contract.bind=\"contract\" delete-call-back.bind=\"refresh()\"></commit-contract></div></div></div></template></template>"; });
 define('text!users/user.edit.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><div class=\"form-group\"><label for=\"name\">${'user:name'|t}</label><input class=\"form-control\" value.bind=\"contract.name\"></div></template>"; });
-define('text!users/user.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\">${'user:name'|t}<i class=\"ml-1 fa fa-user\"></i></dt><dd class=\"col-sm-7\">${contract.name}</dd></dl></template>"; });
+define('text!users/user.view.html', ['module'], function(module) { module.exports = "<template bindable=\"contract\"><dl class=\"row\"><dt class=\"col-sm-5\" for=\"name\"><i class=\"ml-1 fa fa-user\"></i> ${'user:name'|t}</dt><dd class=\"col-sm-7\">${contract.name}</dd></dl></template>"; });
+define('text!pending/index.html', ['module'], function(module) { module.exports = "<template><require from=\"../resources/elements/commit-contract\"></require><template repeat.for=\"contract of contracts\" bindable=\"edit\"><div class=\"col-md-6 mt-1\"><div class=\"modal-content\"><div class=\"modal-header\"><button type=\"button\" class=\"close\" click.delegate=\"edit=!edit\" aria-label.bind=\"edit\"><i class=\"fa ${edit ? 'fa-eye':'fa-edit'}\"></i></button><h5 class=\"modal-title\">${'shell:'+contract.roles.join('.') | t}</h5></div><div class=\"modal-body\"><contract contract.bind=\"contract\" type.bind=\"edit?'edit':'view'\"></contract></div><div class=\"modal-footer\"><commit-contract contract.bind=\"contract\" delete-call-back.bind=\"refresh()\"></commit-contract></div></div></div></template></template>"; });
 define('text!resources/elements/commit-contract.html', ['module'], function(module) { module.exports = "<template><button attribute=\"disabled.bind:disabled\" class=\"btn btn-outline-danger ${disabled?'disabled':''}\" click.trigger=\"deleteContract()\" type=\"button\"><span if.bind=\"!deleting\"><i class=\"fa fa-remove mr-1\"></i>${'shell:delete' | t}</span> <i if.bind=\"deleting\" class=\"fa fa-spinner fa-refresh\"></i></button> <button attribute=\"disabled.bind:disabled\" class=\"btn btn-outline-warning ${disabled?'disabled':''}\" click.trigger=\"commitContract()\" type=\"button\"><span if.bind=\"!savingCommit\"><i class=\"fa fa-send mr-1\"></i>${'shell:sign' | t}</span> <i if.bind=\"savingCommit\" class=\"fa fa-spinner fa-refresh\"></i></button></template>"; });
 define('text!resources/elements/contract.html', ['module'], function(module) { module.exports = "<template><div if.bind=\"useVM\"><compose if.bind=\"contract\" view.bind=\"module[0]\" view-model.bind=\"module[1]\" model.bind=\"contract\"></compose></div><div if.bind=\"!useVM\"><compose if.bind=\"contract\" view.bind=\"module[0]\" model.bind=\"contract\"></compose></div><template></template></template>"; });
 define('text!resources/elements/markdown.html', ['module'], function(module) { module.exports = "<template><div innerhtml.bind=\"content\"></div></template>"; });
diff --git a/src/challenges/challenge.view.html b/src/challenges/challenge.view.html
index 174a755..7079fcd 100644
--- a/src/challenges/challenge.view.html
+++ b/src/challenges/challenge.view.html
@@ -1,6 +1,9 @@
 <template bindable="contract">
     <dl class="row">
-        <dt class="col-sm-5" for="name">${'user:name'|t}<i class="ml-1 fa fa-user"></i></dt>
-        <dd class="col-sm-7" >${contract.actor.name}</dd>
+        <dt class="col-sm-5" for="name">
+            <i class="ml-1 fa fa-user"></i>
+            ${'user:name'|t}
+        </dt>
+        <dd class="col-sm-7">${contract.actor.name}</dd>
     </dl>
 </template>
\ No newline at end of file
diff --git a/src/citations/citation.view.html b/src/citations/citation.view.html
index 174a755..7079fcd 100644
--- a/src/citations/citation.view.html
+++ b/src/citations/citation.view.html
@@ -1,6 +1,9 @@
 <template bindable="contract">
     <dl class="row">
-        <dt class="col-sm-5" for="name">${'user:name'|t}<i class="ml-1 fa fa-user"></i></dt>
-        <dd class="col-sm-7" >${contract.actor.name}</dd>
+        <dt class="col-sm-5" for="name">
+            <i class="ml-1 fa fa-user"></i>
+            ${'user:name'|t}
+        </dt>
+        <dd class="col-sm-7">${contract.actor.name}</dd>
     </dl>
 </template>
\ No newline at end of file
diff --git a/src/claims/claim.view.html b/src/claims/claim.view.html
index b2ffe94..2341498 100644
--- a/src/claims/claim.view.html
+++ b/src/claims/claim.view.html
@@ -1,16 +1,16 @@
 <template bindable="contract">
     <require from="../resources/elements/markdown"></require>
     <dl class="row">
-        <dt class="col-sm-5" for="name">
+        <dt class="col-sm-5">
+            <i class="ml-1 fa fa-bullhorn"></i>
             ${'claim:title'|t}
-            <i class="ml-1 fa fa-user"></i>
         </dt>
         <dd class="col-sm-7">${contract.title}</dd>
     </dl>
     <dl class="row">
-        <dt class="col-sm-5" for="name">
+        <dt class="col-sm-5">
+            <i class="ml-1 fa fa-newspaper-o"></i>
             ${'claim:claim'|t}
-            <i class="ml-1 fa fa-user"></i>
         </dt>
         <dd class="col-sm-7">
             <markdown value.bind="contract.content"></markdown>
diff --git a/src/federations/federation.view.html b/src/federations/federation.view.html
index 174a755..7079fcd 100644
--- a/src/federations/federation.view.html
+++ b/src/federations/federation.view.html
@@ -1,6 +1,9 @@
 <template bindable="contract">
     <dl class="row">
-        <dt class="col-sm-5" for="name">${'user:name'|t}<i class="ml-1 fa fa-user"></i></dt>
-        <dd class="col-sm-7" >${contract.actor.name}</dd>
+        <dt class="col-sm-5" for="name">
+            <i class="ml-1 fa fa-user"></i>
+            ${'user:name'|t}
+        </dt>
+        <dd class="col-sm-7">${contract.actor.name}</dd>
     </dl>
 </template>
\ No newline at end of file
diff --git a/src/questions/question.view.html b/src/questions/question.view.html
index 5033d8e..8cf6cc5 100644
--- a/src/questions/question.view.html
+++ b/src/questions/question.view.html
@@ -2,15 +2,15 @@
     <require from="../resources/elements/markdown"></require>
     <dl class="row">
         <dt class="col-sm-5" for="name">
+            <i class="ml-1 fa fa-question"></i>
             ${'question:title'|t}
-            <i class="ml-1 fa fa-user"></i>
         </dt>
         <dd class="col-sm-7">${contract.title}</dd>
     </dl>
     <dl class="row">
         <dt class="col-sm-5" for="name">
+            <i class="ml-1 fa fa-newspaper-o"></i>
             ${'question:question'|t}
-            <i class="ml-1 fa fa-user"></i>
         </dt>
         <dd class="col-sm-7">
             <markdown value.bind="contract.content"></markdown>
diff --git a/src/users/user.view.html b/src/users/user.view.html
index 1cabba8..5d98b40 100644
--- a/src/users/user.view.html
+++ b/src/users/user.view.html
@@ -1,6 +1,9 @@
 <template bindable="contract">
     <dl class="row">
-        <dt class="col-sm-5" for="name">${'user:name'|t}<i class="ml-1 fa fa-user"></i></dt>
+        <dt class="col-sm-5" for="name">
+            <i class="ml-1 fa fa-user"></i>
+            ${'user:name'|t}
+        </dt>
         <dd class="col-sm-7">${contract.name}</dd>
     </dl>
 </template>
\ No newline at end of file