--- a/src/p4l/settings.py	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/settings.py	Fri Sep 13 16:03:37 2013 +0200
@@ -508,7 +508,12 @@
     'PAGINATE_BY_PARAM': 'page_size' 
 }
 
-LANGUAGES_LIST = [(u"Abkhaz","ab"),
+LANGUAGES_LIST = [
+(u"French","fr"),
+(u"English","en"),
+(u"Spanish; Castilian","es"),
+(u"",""),
+(u"Abkhaz","ab"),
 (u"Afar","aa"),
 (u"Afrikaans","af"),
 (u"Akan","ak"),

--- a/src/p4l/static/p4l/css/p4l.css	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/css/p4l.css	Fri Sep 13 16:03:37 2013 +0200
@@ -29,7 +29,7 @@
     margin-bottom: 5px;
 }
 .after-plus {
-    padding-top: 5px;
+    margin-top: 5px;
 }
 .rotate{
 	transform:rotate(90deg);
@@ -51,8 +51,15 @@
 .grey-hover:nth-child(odd) {
      background: #EEE;
 }
+.well {
+    margin-bottom: 5px;
+    padding: 4px 5px 8px 8px;
+}
+label {
+    margin-bottom: 0px;
+}
+
 /* Flags */
-
 .flag {
     width: 16px;
     height: 11px;

--- a/src/p4l/static/p4l/templates/abstractForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/abstractForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,6 +1,10 @@
- <form class="well span3">
-    <div class="span3 row">
-     <label for="abstract-{{$id}}">{{'abstract'|translate}}</label><textarea placeholder="{{'abstract'|translate}}" ng_model="editedObj.abstract" name="abstract" id="abstract-{{$id}}" class="form-control span3"></textarea>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="abstract-{{$id}}">{{'abstract'|translate}}</label>
+    <textarea placeholder="{{'abstract'|translate}}" ng_model="editedObj.abstract" id="abstract-{{$id}}" class="form-control"></textarea>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/collationForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/collationForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,6 +1,10 @@
- <form class="well span3">
-    <div class="span3 row">
-     <label for="collation-{{$id}}">{{'collation'|translate}}</label><input type="text" placeholder="{{'collation'|translate}}" ng_model="editedObj.collation" name="collation" id="collation-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="collation-{{$id}}">{{'collation'|translate}}</label>
+    <input type="text" placeholder="{{'collation'|translate}}" ng_model="editedObj.collation" id="collation-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/documentCodeForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/documentCodeForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,5 +1,6 @@
- <form class="well span3">
-    <div class="span3 row">
-     <label for="document-code-{{$id}}">{{'document code'|translate}}</label><input type="text" placeholder="{{'document code'|translate}}" ng_model="editedObj.documentCode" name="documentCode" id="document-code-{{$id}}" class="span3"/>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="document-code-{{$id}}">{{'document code'|translate}}</label>
+     <input type="text" placeholder="{{'document code'|translate}}" ng_model="editedObj.documentCode" id="document-code-{{$id}}" class="form-control"/>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/imprintForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/imprintForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,10 +1,18 @@
- <form class="well span6">
-    <div class="span3 row">
-     <label for="imprint-city-{{$id}}">{{'City'|translate}}</label><input type="text" placeholder="{{'City'|translate}}" ng_model="editedObj.imprintCity" name="imprintCity" id="imprint-city-{{$id}}" class="span3"/>
-     <label for="imprint-publisher-{{$id}}">{{'Publisher'|translate}}</label><input type="text" placeholder="{{'Publisher'|translate}}" ng_model="editedObj.publisher" name="publisher" id="imprint-publisher-{{$id}}" class="span3"/>
-     </div>
-     <div class="span3 row">
-     <label for="imprint-date-{{$id}}">{{'Date'|translate}}</label><input type="text" placeholder="{{'Date'|translate}}" ng_model="editedObj.imprintDate" name="imprintDate" id="imprint-date-{{$id}}" class="span3"/>
-     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="imprint-city-{{$id}}">{{'City'|translate}}</label>
+    <input type="text" placeholder="{{'City'|translate}}" ng_model="editedObj.imprintCity" id="imprint-city-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="imprint-publisher-{{$id}}">{{'Publisher'|translate}}</label>
+    <input type="text" placeholder="{{'Publisher'|translate}}" ng_model="editedObj.publisher" id="imprint-publisher-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="imprint-date-{{$id}}">{{'Date'|translate}}</label>
+    <input type="text" placeholder="{{'Date'|translate}}" ng_model="editedObj.imprintDate" id="imprint-date-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/isbnForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/isbnForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,6 +1,10 @@
- <form class="well span3">
-    <div class="span3 row">
-     <label for="isbn-{{$id}}">{{'isbn'|translate}}</label><input type="text" placeholder="{{'isbn'|translate}}" ng_model="editedObj.isbn" name="isbn" id="isbn-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="isbn-{{$id}}">{{'isbn'|translate}}</label>
+    <input type="text" placeholder="{{'isbn'|translate}}" ng_model="editedObj.isbn" id="isbn-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/issnForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/issnForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,6 +1,10 @@
- <form class="well span3">
-    <div class="span3 row">
-     <label for="issn-{{$id}}">{{'issn'|translate}}</label><input type="text" placeholder="{{'issn'|translate}}" ng_model="editedObj.issn" name="issn" id="issn-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="issn-{{$id}}">{{'issn'|translate}}</label>
+    <input type="text" id="issn-{{$id}}" placeholder="{{'issn'|translate}}" ng_model="editedObj.issn" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/languagesListInput.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/languagesListInput.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,1 +1,1 @@
-<select class="input-medium" ng-model="obj"  ng-options="i.1 as i.0+' ('+i.1+')' for i in list" ></select>
\ No newline at end of file
+<select class="form-control" ng-model="obj"  ng-options="i.1 as i.0+' ('+i.1+')' for i in list" ></select>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/meetingForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/meetingForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,16 +1,26 @@
- <form class="well span6">
-    <div class="span3 row">
-     <label for="label-{{$id}}">{{'Label'|translate}}</label><input type="text" placeholder="{{'Label'|translate}}" ng_model="editedObj.label" name="meetingNumber" id="label-{{$id}}" class="span3"/>
-     </div>
-    <div class="span3 row">
-     <label for="meeting-number-{{$id}}">{{'Number'|translate}}</label><input type="text" placeholder="{{'Number'|translate}}" ng_model="editedObj.meetingNumber" name="meetingnumber" id="meeting-number-{{$id}}" class="span3"/>
-     <label for="meeting-place-{{$id}}">{{'Place'|translate}}</label><input type="text" placeholder="{{'Place'|translate}}" ng_model="editedObj.meetingPlace" name="place" id="meeting-place-{{$id}}" class="span3"/>
-     </div>
-     <div class="span3 row">
-     <label for="meeting-date-{{$id}}">{{'Date'|translate}}</label><input type="text" placeholder="{{'Date'|translate}}" ng_model="editedObj.meetingDate" name="meetingDate" id="meeting-date-{{$id}}" class="span3"/>
-     <label for="meeting-year-{{$id}}">{{'Year'|translate}}</label><input type="text" placeholder="{{'Year'|translate}}" ng_model="editedObj.meetingYear" name="year" id="meeting-year-{{$id}}" class="span3"/>
-     </div>
-    <div class="span3 row">
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="label-{{$id}}">{{'label'|translate}}</label>
+    <input type="text" placeholder="{{'Label'|translate}}" ng_model="editedObj.label" id="label-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="meeting-number-{{$id}}">{{'Number'|translate}}</label>
+    <input type="text" placeholder="{{'Number'|translate}}" ng_model="editedObj.meetingNumber" id="meeting-number-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="meeting-place-{{$id}}">{{'Place'|translate}}</label>
+    <input type="text" placeholder="{{'Place'|translate}}" ng_model="editedObj.meetingPlace" id="meeting-place-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="meeting-date-{{$id}}">{{'Date'|translate}}</label>
+    <input type="text" placeholder="{{'Date'|translate}}" ng_model="editedObj.meetingDate" id="meeting-date-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="meeting-year-{{$id}}">{{'Year'|translate}}</label>
+    <input type="text" placeholder="{{'Year'|translate}}" ng_model="editedObj.meetingYear" id="meeting-year-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/objectList.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/objectList.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,15 +1,15 @@
 <div>
-<ul>
+  <ul>
     <li ng-repeat="obj in list">
         <!--ng-include src="getStaticTemplateUrl(dispTemplate)"></ng-include-->
         <object-disp obj="obj" disp-template="dispTemplate"></object-disp>
         <a ng-click='removeFromList(obj)' class="btn btn-default btn-xs"><i class="glyphicon glyphicon-trash"></i></a>
         <a ng-click='setEditedObject(obj)' class="btn btn-default btn-xs"><i class="glyphicon glyphicon-pencil"></i></a>
     </li>
-</ul>
-<a ng-click='newEditedObject()' class="btn btn-default btn-xs"><i class="glyphicon glyphicon-plus-sign"></i></a>
-<div ng-show="editedObj!==null">
+  </ul>
+  <a ng-click='newEditedObject()' class="btn btn-default btn-xs"><i class="glyphicon glyphicon-plus-sign"></i></a>
+  <div class="after-plus" ng-show="editedObj!==null">
     <ng-include src="getStaticTemplateUrl(formTemplate)"></ng-include>
     <button ng-click="onOk()" class="btn btn-primary">OK</button>
-</div>
+  </div>
 </div>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/objectListTable.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/objectListTable.html	Fri Sep 13 16:03:37 2013 +0200
@@ -15,7 +15,7 @@
     </div>
 </table>
 <a ng-click='newEditedObject()' class="btn btn-default btn-xs"><i class="glyphicon glyphicon-plus-sign"></i></a>
-<div ng-show="editedObj!==null">
+<div class="after-plus" ng-show="editedObj!==null">
     <ng-include src="getStaticTemplateUrl(formTemplate)"></ng-include>
     <button ng-click="onOk()" class="btn btn-primary">OK</button>
 </div>

--- a/src/p4l/static/p4l/templates/periodicalForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/periodicalForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,6 +1,10 @@
- <form class="well span3">
-    <div class="span3 row">
-     <label for="label-{{$id}}">{{'label'|translate}}</label><input type="text" placeholder="{{'label'|translate}}" ng_model="editedObj.label" name="label" id="label-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="label-{{$id}}">{{'label'|translate}}</label>
+    <input type="text" placeholder="{{'label'|translate}}" ng_model="editedObj.label" id="label-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/personForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/personForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,5 +1,6 @@
- <form class="well span3">
-    <div class="span3 row">
-        <label for="name-{{$id}}">{{'name'|translate}}</label><input type="text" placeholder="{{'name'|translate}}" ng_model="editedObj.name" name="name" id="name-{{$id}}" class="span3"/>
-    </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="name-{{$id}}">{{'name'|translate}}</label>
+    <input type="text" placeholder="{{'name'|translate}}" ng_model="editedObj.name" id="name-{{$id}}" class="form-control"/>
+  </div>
+</form>

--- a/src/p4l/static/p4l/templates/serieForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/serieForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,9 +1,14 @@
- <form class="well span6">
-    <div class="span3 row">
-     <label for="imprint-title-{{$id}}">{{'Title'|translate}}</label><input type="text" placeholder="{{'Title'|translate}}" ng_model="editedObj.title" name="title" id="imprint-title-{{$id}}" class="span3"/>
-     <label for="imprint-volume-{{$id}}">{{'Volume'|translate}}</label><input type="text" placeholder="{{'Volume'|translate}}" ng_model="editedObj.volume" name="imprintvolume" id="imprint-volume-{{$id}}" class="span3"/>
-     </div>
-     <div class="span3 row">
-     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="imprint-title-{{$id}}">{{'Title'|translate}}</label>
+    <input type="text" placeholder="{{'Title'|translate}}" ng_model="editedObj.title" name="title" id="imprint-title-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="imprint-volume-{{$id}}">{{'Volume'|translate}}</label>
+    <input type="text" placeholder="{{'Volume'|translate}}" ng_model="editedObj.volume" id="imprint-volume-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/titleForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/titleForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,6 +1,10 @@
- <form class="well span3">
-    <div class="span3 row">
-     <label for="title-{{$id}}">{{'title'|translate}}</label><input type="text" placeholder="{{'title'|translate}}" ng_model="editedObj.title" name="title" id="title-{{$id}}" class="span3"/>
-     <label for="lang-{{$id}}">{{'lang'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="title-{{$id}}">{{'title'|translate}}</label>
+    <input type="text" placeholder="{{'title'|translate}}" ng_model="editedObj.title" name="title" id="title-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="lang-{{$id}}">{{'lang'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/urlForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/urlForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,9 +1,14 @@
- <form class="well span6">
-    <div class="span3 row">
-     <label for="address-{{$id}}">{{'Address'|translate}}</label><input type="text" placeholder="{{'Address'|translate}}" ng_model="editedObj.address" name="address" id="address-{{$id}}" class="span3"/>
-     <label for="display-{{$id}}">{{'display'|translate}}</label><input type="text" placeholder="{{'display'|translate}}" ng_model="editedObj.display" name="display" id="display-{{$id}}" class="span3"/>
-     </div>
-     <div class="span3 row">
-     <label for="accessLevel-{{$id}}">{{'Access Level'|translate}}</label><input type="text" placeholder="{{'Access Level'|translate}}" ng_model="editedObj.accessLevel" name="accessLevel" id="accessLevel-{{$id}}" class="span3"/>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="address-{{$id}}">{{'Address'|translate}}</label>
+    <input type="text" placeholder="{{'Address'|translate}}" ng_model="editedObj.address" id="address-{{$id}}"  class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="display-{{$id}}">{{'display'|translate}}</label>
+    <input type="text" placeholder="{{'display'|translate}}" ng_model="editedObj.display" id="display-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="accessLevel-{{$id}}">{{'Access Level'|translate}}</label>
+    <input type="text" placeholder="{{'Access Level'|translate}}" ng_model="editedObj.accessLevel" id="accessLevel-{{$id}}" class="form-control"/>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/static/p4l/templates/volumeIssueForm.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/static/p4l/templates/volumeIssueForm.html	Fri Sep 13 16:03:37 2013 +0200
@@ -1,9 +1,14 @@
- <form class="well span6">
-    <div class="span3 row">
-     <label for="imprint-volume-{{$id}}">{{'Volume'|translate}}</label><input type="text" placeholder="{{'Volume'|translate}}" ng_model="editedObj.volume" name="volume" id="imprint-volume-{{$id}}" class="span3"/>
-     <label for="imprint-number-{{$id}}">{{'Number'|translate}}</label><input type="text" placeholder="{{'Number'|translate}}" ng_model="editedObj.number" name="number" id="imprint-number-{{$id}}" class="span3"/>
-     </div>
-     <div class="span3 row">
-     <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label><languages-list-input obj="editedObj.lang"></languages-list-input>
-     </div>
- </form>
\ No newline at end of file
+<form class="form-inline well" role="form">
+  <div class="form-group">
+    <label for="imprint-volume-{{$id}}">{{'Volume'|translate}}</label>
+    <input type="text" placeholder="{{'Volume'|translate}}" ng_model="editedObj.volume" id="imprint-volume-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="imprint-number-{{$id}}">{{'Number'|translate}}</label>
+    <input type="text" placeholder="{{'Number'|translate}}" ng_model="editedObj.number" id="imprint-number-{{$id}}" class="form-control"/>
+  </div>
+  <div class="form-group">
+    <label for="imprint-lang-{{$id}}">{{'Language'|translate}}</label>
+    <languages-list-input obj="editedObj.lang"></languages-list-input>
+  </div>
+</form>
\ No newline at end of file

--- a/src/p4l/templates/p4l/p4l_record_view.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/templates/p4l/p4l_record_view.html	Fri Sep 13 16:03:37 2013 +0200
@@ -6,6 +6,9 @@
 {% block page_title %}{% trans 'Record' %} {{ record.identifier }} - {% trans 'View' %}{% endblock %}
 
 {% block content %}
+<div class="row text-right">
+    <a class="btn btn-default" href="{% url 'p4l_record_edit' slug=record.identifier %}?previous={{request.get_full_path|urlencode}}">{% trans 'Edit the record' %} <i class="glyphicon glyphicon-pencil"></i></a>
+</div>
 <table class="table record-table">
   <thead>
     <tr><td>{% trans 'property' %}</td><td>{% trans 'value' %}</td></tr>
@@ -217,4 +220,7 @@
     </tr>
   </tbody>
 </table>
+<div class="row text-right">
+    <a class="btn btn-default" href="{% url 'p4l_record_edit' slug=record.identifier %}?previous={{request.get_full_path|urlencode}}">{% trans 'Edit the record' %} <i class="glyphicon glyphicon-pencil"></i></a>
+</div>
 {% endblock %}
\ No newline at end of file

--- a/src/p4l/templates/p4l/record_update_form.html	Fri Sep 13 13:00:36 2013 +0200
+++ b/src/p4l/templates/p4l/record_update_form.html	Fri Sep 13 16:03:37 2013 +0200
@@ -43,6 +43,9 @@
 {% endblock %}
 
 {% block content %}
+<div class="row text-right">
+    <a class="btn btn-default" href="{% url 'p4l_record_view' slug=record.identifier %}">{% trans 'View the record' %} <i class="glyphicon glyphicon-eye-open"></i></a>
+</div>
 {% verbatim %}
 <div ng-app="recordApp" ng-controller="RecordCtrl" ng-cloak>
 <form name="recordForm">
@@ -215,4 +218,7 @@
 </form>
 </div>
 {% endverbatim %}
+<div class="row text-right">
+    <a class="btn btn-default" href="{% url 'p4l_record_view' slug=record.identifier %}">{% trans 'View the record' %} <i class="glyphicon glyphicon-eye-open"></i></a>
+</div>
 {% endblock %}
\ No newline at end of file