diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 4a0f4ea..749c0d2 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -54,6 +54,8 @@ services:
 
     fsc_hateoas.serializer.xml_form_view:
         class: %fsc_hateoas.serializer.xml_form_view.class%
+        arguments:
+            - @translator
 
     fsc_hateoas.serializer.event_subscriber.link:
         class: %fsc_hateoas.serializer.event_subscriber.link.class%
diff --git a/Serializer/XmlFormViewSerializer.php b/Serializer/XmlFormViewSerializer.php
index 055542e..0244b25 100644
--- a/Serializer/XmlFormViewSerializer.php
+++ b/Serializer/XmlFormViewSerializer.php
@@ -4,9 +4,17 @@
 
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\Extension\Core\View\ChoiceView;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class XmlFormViewSerializer
 {
+    protected $translator;
+
+    public function __construct (TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     protected static $baseTypes = array(
         'text', 'textarea', 'email', 'integer', 'money', 'number', 'password', 'percent', 'search', 'url', 'hidden',
         'collection', 'choice', 'checkbox', 'radio', 'datetime', 'date',
@@ -42,6 +50,10 @@ protected function serializeBlock(\DOMElement $parentElement, FormView $view, $b
             }
         }
 
+        if (null === $variables['label']) {
+            $variables['label'] = $this->humanize($variables['name']);
+        }
+
         if ($view->isRendered()) {
             return;
         }
@@ -49,6 +61,11 @@ protected function serializeBlock(\DOMElement $parentElement, FormView $view, $b
         if ('rest' == $blockName) {
             $this->serializeRestWidget($parentElement, $view, $variables);
         } else {
+
+            if (($type || 'widget' == $blockName) && false !== $variables['label']) {
+                $this->serializeLabel($parentElement, $type, $variables);
+            }
+
             switch ($type) {
                 case 'text':
                     $this->serializeWidgetSimple($parentElement, $view, $variables);
@@ -111,7 +128,6 @@ protected function serializeBlock(\DOMElement $parentElement, FormView $view, $b
                     }
             }
 
-
         }
 
         $view->setRendered();
@@ -182,6 +198,16 @@ protected function serializeWidgetSimple(\DOMElement $parentElement, FormView $v
         $this->addWidgetAttributes($inputElement, $view, $variables);
     }
 
+    protected function serializeLabel(\DOMElement $parentElement, $type, $variables)
+    {
+        $translatedLabel = $this->translator->trans($variables['label']);
+        $labelElement = $parentElement->ownerDocument->createElement('label',$translatedLabel);
+        $parentElement->appendChild($labelElement);
+
+        $labelElement->setAttribute('for', $variables['id']);
+
+    }
+
     /*
         id="{{ id }}"
         name="{{ full_name }}"
@@ -202,6 +228,8 @@ protected function addWidgetAttributes(\DOMElement $widgetElement, FormView $vie
     {
         $widgetElement->setAttribute('name', $variables['full_name']);
 
+        $widgetElement->setAttribute('id', $variables['id']);
+
         if ($variables['read_only']) {
             $widgetElement->setAttribute('readonly', 'readonly');
         }
@@ -224,7 +252,7 @@ protected function addWidgetAttributes(\DOMElement $widgetElement, FormView $vie
 
         foreach ($variables['attr'] as $name => $value) {
             if (in_array($name, array('placeholder', 'title'))) {
-                // TODO Translate the thing ...
+                $value = $this->translator->trans($value);
             }
 
             $widgetElement->setAttribute($name, $value);
@@ -320,6 +348,15 @@ protected function serializeUrlWidget(\DOMElement $parentElement, FormView $view
         $this->serializeWidgetSimple($parentElement, $view, $variables);
     }
 
+    protected function serializeFieldset(\DOMElement $parentElement, FormView $view, $variables)
+    {
+        $fieldsetElement = $parentElement->ownerDocument->createElement('fieldset');
+        $parentElement->appendChild($fieldsetElement);
+
+        $fieldsetElement->setAttribute('id', $variables['id']);
+
+        $this->serializeChoiceWidgetExpanded($fieldsetElement, $view, $variables);
+    }
     /*
         {% if expanded %}
             {{ block('choice_widget_expanded') }}
@@ -330,7 +367,7 @@ protected function serializeUrlWidget(\DOMElement $parentElement, FormView $view
     protected function serializeChoiceWidget(\DOMElement $parentElement, FormView $view, $variables)
     {
         return isset($variables['expanded']) && $variables['expanded']
-            ? $this->serializeChoiceWidgetExpanded($parentElement, $view, $variables)
+            ? $this->serializeFieldset($parentElement, $view, $variables)
             : $this->serializeChoiceWidgetCollapsed($parentElement, $view, $variables)
         ;
     }
@@ -378,7 +415,8 @@ protected function serializeChoiceWidgetCollapsed(\DOMElement $parentElement, Fo
         }
 
         if (isset($variables['empty_value']) && null !== $variables['empty_value']) {
-            $noneOptionElement = $selectElement->ownerDocument->createElement('option', $variables['empty_value']);
+            $translatedEmpty_value = $this->translator->trans($variables['empty_value']);
+            $noneOptionElement = $selectElement->ownerDocument->createElement('option', $translatedEmpty_value);
             $noneOptionElement->setAttribute('value', '');
 
             $selectElement->appendChild($noneOptionElement);
@@ -420,7 +458,8 @@ protected function serializeChoiceWidgetOptions(\DOMElement $selectElement, Form
                     'options' => $choiceView,
                 )));
             } else {
-                $optionElement = $selectElement->ownerDocument->createElement('option', $choiceView->label);
+                $translatedLabel = $this->translator->trans($choiceView->label);
+                $optionElement = $selectElement->ownerDocument->createElement('option', $translatedLabel);
                 $optionElement->setAttribute('value', $choiceView->value);
 
                 if ($this->isSelectedChoice($choiceView, $variables['value'])) {
@@ -592,4 +631,14 @@ protected function isSelectedChoice(ChoiceView $choice, $selectedValue)
 
         return $choice->value === $selectedValue;
     }
+
+    /**
+     * Copied from the symfony src code
+     *
+     * @see Symfony\Component\Form\FormRenderer::humanize
+     */
+    public function humanize($text)
+    {
+        return ucfirst(trim(strtolower(preg_replace('/[_\s]+/', ' ', $text))));
+    }
 }
diff --git a/Tests/Functional/ControllerTest.php b/Tests/Functional/ControllerTest.php
index ce0ecd1..6c8e550 100644
--- a/Tests/Functional/ControllerTest.php
+++ b/Tests/Functional/ControllerTest.php
@@ -129,7 +129,8 @@ public function testGetCreatePostFormXml()
 <?xml version="1.0" encoding="UTF-8"?>
 <form method="POST" action="http://localhost/api/posts">
   <link rel="self" href="http://localhost/api/posts/create?_format=xml"/>
-  <input type="text" name="post[title]" required="required"/>
+  <label for="post_title">Title</label>
+  <input type="text" name="post[title]" id="post_title" required="required"/>
 </form>
 
 XML
@@ -148,7 +149,8 @@ public function testGetCreatePostWithFormatInLinksFormXml()
 <?xml version="1.0" encoding="UTF-8"?>
 <form method="POST" action="http://localhost/api/posts?_format=xml">
   <link rel="self" href="http://localhost/api/posts/create_format?_format=xml"/>
-  <input type="text" name="post[title]" required="required"/>
+  <label for="post_title">Title</label>
+  <input type="text" name="post[title]" id="post_title" required="required"/>
 </form>
 
 XML
@@ -184,7 +186,8 @@ public function testListPostsXml()
   <link rel="create" href="http://localhost/api/posts/create"/>
   <form rel="create" method="POST" action="http://localhost/api/posts">
     <link rel="self" href="http://localhost/api/posts/create"/>
-    <input type="text" name="post[title]" required="required"/>
+    <label for="post_title">Title</label>
+    <input type="text" name="post[title]" id="post_title" required="required"/>
   </form>
 </posts>
 
diff --git a/Tests/Functional/Serializer/XmlFormViewSerializerTest.php b/Tests/Functional/Serializer/XmlFormViewSerializerTest.php
index fa663a6..a25558c 100644
--- a/Tests/Functional/Serializer/XmlFormViewSerializerTest.php
+++ b/Tests/Functional/Serializer/XmlFormViewSerializerTest.php
@@ -14,7 +14,9 @@ public function test()
     {
         $formFactory = $this->getKernel()->getContainer()->get('form.factory');
         $form = $formFactory->createBuilder('form')
-            ->add('name', 'text')
+            ->add('name', 'text',array(
+                'label' => 'custom label'
+            ))
             ->add('description', 'textarea')
             ->add('email', 'email')
             ->add('age', 'integer')
@@ -24,12 +26,14 @@ public function test()
             ->add('query', 'search')
             ->add('website', 'url')
             ->add('gender', 'choice', array(
-                'choices' => array('m' => 'male', 'f' => 'female')
+                'choices' => array('m' => 'male', 'f' => 'female'),
+                'label' => 'custom'
             ))
             ->add('genderRadio', 'choice', array(
                 'choices' => array('m' => 'male', 'f' => 'female'),
                 'expanded' => true,
                 'multiple' => false,
+                'label' => 'label'
             ))
             ->add('limit', 'hidden')
             ->add('towns', 'collection', array(
@@ -42,7 +46,7 @@ public function test()
                 ),
             ))
             ->add('public', 'checkbox', array(
-                'label'     => 'Show this entry publicly?',
+                'label'     => 'label',
                 'required'  => false,
             ))
             ->getForm();
@@ -55,31 +59,52 @@ public function test()
 
         $formView = $form->createView();
 
-        $xmlFormViewSerializer = new XmlFormViewSerializer();
+        $translator = $this->getKernel()->getContainer()->get('translator');
+        $xmlFormViewSerializer = new XmlFormViewSerializer($translator);
 
         $xmlFormViewSerializer->serialize($formView, $formElement = $this->createFormElement());
 
         $this->assertXmlElementEquals(<<<XML
 <form>
-    <input type="text" name="form[name]" required="required"/>
-    <textarea name="form[description]" required="required">Desc</textarea>
-    <input type="email" name="form[email]" required="required"/>
-    <input type="integer" name="form[age]" required="required"/>
-    <input type="number" name="form[height]" required="required"/>
-    <input type="password" name="form[password]" required="required"/>
-    <input type="text" name="form[progress]" required="required"/>
-    <input type="search" name="form[query]" required="required"/>
-    <input type="url" name="form[website]" required="required"/>
-    <select name="form[gender]" required="required">
+    <label for="form_name">custom label</label>
+    <input type="text" name="form[name]" id="form_name" required="required"/>
+    <label for="form_description">Description</label>
+    <textarea name="form[description]" id="form_description" required="required">Desc</textarea>
+    <label for="form_email">Email</label>
+    <input type="email" name="form[email]" id="form_email" required="required"/>
+    <label for="form_age">Age</label>
+    <input type="integer" name="form[age]" id="form_age" required="required"/>
+    <label for="form_height">Height</label>
+    <input type="number" name="form[height]" id="form_height" required="required"/>
+    <label for="form_password">Password</label>
+    <input type="password" name="form[password]" id="form_password" required="required"/>
+    <label for="form_progress">Progress</label>
+    <input type="text" name="form[progress]" id="form_progress" required="required"/>
+    <label for="form_query">Query</label>
+    <input type="search" name="form[query]" id="form_query" required="required"/>
+    <label for="form_website">Website</label>
+    <input type="url" name="form[website]" id="form_website" required="required"/>
+    <label for="form_gender">custom</label>
+    <select name="form[gender]" id="form_gender" required="required">
         <option value="m">male</option>
         <option value="f">female</option>
     </select>
-    <input type="radio" value="m" name="form[genderRadio]" required="required"/>
-    <input type="radio" value="f" name="form[genderRadio]" required="required"/>
-    <input type="hidden" name="form[limit]"/>
-    <input type="email" value="Paris" name="form[towns][par]" class="email-box"/>
-    <input type="email" value="London" name="form[towns][lon]" class="email-box"/>
-    <input type="checkbox" value="1" checked="1" name="form[public]"/>
+    <label for="form_genderRadio">label</label>
+    <fieldset id="form_genderRadio">
+        <label for="form_genderRadio_0">male</label>
+        <input type="radio" value="m" name="form[genderRadio]" id="form_genderRadio_0" required="required"/>
+        <label for="form_genderRadio_1">female</label>
+        <input type="radio" value="f" name="form[genderRadio]" id="form_genderRadio_1" required="required"/>
+    </fieldset>
+    <label for="form_limit">Limit</label>
+    <input type="hidden" name="form[limit]" id="form_limit"/>
+    <label for="form_towns">Towns</label>
+    <label for="form_towns_par">Par</label>
+    <input type="email" value="Paris" name="form[towns][par]" id="form_towns_par" class="email-box"/>
+    <label for="form_towns_lon">Lon</label>
+    <input type="email" value="London" name="form[towns][lon]" id="form_towns_lon" class="email-box"/>
+    <label for="form_public">label</label>
+    <input type="checkbox" value="1" checked="1" name="form[public]" id="form_public"/>
 </form>
 XML
         , $formElement);
@@ -94,13 +119,15 @@ public function testFileType()
 
         $formView = $form->createView();
 
-        $xmlFormViewSerializer = new XmlFormViewSerializer();
+        $translator = $this->getKernel()->getContainer()->get('translator');
+        $xmlFormViewSerializer = new XmlFormViewSerializer($translator);
 
         $xmlFormViewSerializer->serialize($formView, $formElement = $this->createFormElement());
 
         $this->assertXmlElementEquals(<<<XML
 <form enctype="multipart/form-data">
-    <input type="file" name="form[avatar]" required="required"/>
+    <label for="form_avatar">Avatar</label>
+    <input type="file" name="form[avatar]" id="form_avatar" required="required"/>
 </form>
 XML
             , $formElement);
@@ -108,6 +135,9 @@ public function testFileType()
 
     public function testDateFields()
     {
+        // force locale for PHP_INTL DateTime
+        locale_set_default('en-US');
+
         $formFactory = $this->getKernel()->getContainer()->get('form.factory');
         $form = $formFactory->createBuilder('form')
             ->add('publishedAt', 'date', array(
@@ -130,13 +160,16 @@ public function testDateFields()
 
         $formView = $form->createView();
 
-        $xmlFormViewSerializer = new XmlFormViewSerializer();
+        $translator = $this->getKernel()->getContainer()->get('translator');
+        $xmlFormViewSerializer = new XmlFormViewSerializer($translator);
 
         $xmlFormViewSerializer->serialize($formView, $formElement = $this->createFormElement());
 
         $this->assertXmlElementEquals(<<<XML
 <form>
-    <select name="form[publishedAt][year]" required="required">
+    <label for="form_publishedAt">Publishedat</label>
+    <label for="form_publishedAt_year">Year</label>
+    <select name="form[publishedAt][year]" id="form_publishedAt_year" required="required">
         <option value="2008">2008</option>
         <option value="2009">2009</option>
         <option value="2010">2010</option>
@@ -149,7 +182,8 @@ public function testDateFields()
         <option value="2017">2017</option>
         <option value="2018">2018</option>
     </select>
-    <select name="form[publishedAt][month]" required="required">
+    <label for="form_publishedAt_month">Month</label>
+    <select name="form[publishedAt][month]" id="form_publishedAt_month" required="required">
         <option value="1">Jan</option>
         <option value="2">Feb</option>
         <option value="3">Mar</option>
@@ -163,7 +197,8 @@ public function testDateFields()
         <option value="11">Nov</option>
         <option value="12">Dec</option>
     </select>
-    <select name="form[publishedAt][day]" required="required">
+    <label for="form_publishedAt_day">Day</label>
+    <select name="form[publishedAt][day]" id="form_publishedAt_day" required="required">
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -196,11 +231,19 @@ public function testDateFields()
         <option value="30">30</option>
         <option value="31">31</option>
     </select>
-    <input type="text" name="form[editedAt][year]" required="required"/>
-    <input type="text" name="form[editedAt][month]" required="required"/>
-    <input type="text" name="form[editedAt][day]" required="required"/>
-    <input type="date" name="form[createdAt]" required="required"/>
-    <select name="form[publishedAtTime][date][year]" required="required">
+    <label for="form_editedAt">Editedat</label>
+    <label for="form_editedAt_year">Year</label>
+    <input type="text" name="form[editedAt][year]" id="form_editedAt_year" required="required"/>
+    <label for="form_editedAt_month">Month</label>
+    <input type="text" name="form[editedAt][month]" id="form_editedAt_month" required="required"/>
+    <label for="form_editedAt_day">Day</label>
+    <input type="text" name="form[editedAt][day]" id="form_editedAt_day" required="required"/>
+    <label for="form_createdAt">Createdat</label>
+    <input type="date" name="form[createdAt]" id="form_createdAt" required="required"/>
+    <label for="form_publishedAtTime">Publishedattime</label>
+    <label for="form_publishedAtTime_date">Date</label>
+    <label for="form_publishedAtTime_date_year">Year</label>
+    <select name="form[publishedAtTime][date][year]" id="form_publishedAtTime_date_year" required="required">
         <option value="2008">2008</option>
         <option value="2009">2009</option>
         <option value="2010">2010</option>
@@ -213,7 +256,8 @@ public function testDateFields()
         <option value="2017">2017</option>
         <option value="2018">2018</option>
     </select>
-    <select name="form[publishedAtTime][date][month]" required="required">
+    <label for="form_publishedAtTime_date_month">Month</label>
+    <select name="form[publishedAtTime][date][month]" id="form_publishedAtTime_date_month" required="required">
         <option value="1">Jan</option>
         <option value="2">Feb</option>
         <option value="3">Mar</option>
@@ -227,7 +271,8 @@ public function testDateFields()
         <option value="11">Nov</option>
         <option value="12">Dec</option>
     </select>
-    <select name="form[publishedAtTime][date][day]" required="required">
+    <label for="form_publishedAtTime_date_day">Day</label>
+    <select name="form[publishedAtTime][date][day]" id="form_publishedAtTime_date_day" required="required">
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -260,7 +305,9 @@ public function testDateFields()
         <option value="30">30</option>
         <option value="31">31</option>
     </select>
-    <select name="form[publishedAtTime][time][hour]" required="required">
+    <label for="form_publishedAtTime_time">Time</label>
+    <label for="form_publishedAtTime_time_hour">Hour</label>
+    <select name="form[publishedAtTime][time][hour]" id="form_publishedAtTime_time_hour" required="required">
         <option value="0">00</option>
         <option value="1">01</option>
         <option value="2">02</option>
@@ -286,7 +333,8 @@ public function testDateFields()
         <option value="22">22</option>
         <option value="23">23</option>
     </select>
-    <select name="form[publishedAtTime][time][minute]" required="required">
+    <label for="form_publishedAtTime_time_minute">Minute</label>
+    <select name="form[publishedAtTime][time][minute]" id="form_publishedAtTime_time_minute" required="required">
         <option value="0">00</option>
         <option value="1">01</option>
         <option value="2">02</option>
@@ -370,13 +418,15 @@ public function testAttributes()
             'rel'    => 'create',
         );
 
-        $xmlFormViewSerializer = new XmlFormViewSerializer();
+        $translator = $this->getKernel()->getContainer()->get('translator');
+        $xmlFormViewSerializer = new XmlFormViewSerializer($translator);
 
         $xmlFormViewSerializer->serialize($formView, $formElement = $this->createFormElement());
 
         $this->assertXmlElementEquals(<<<XML
 <form method="POST" action="http://localhost/hey" rel="create">
-    <input type="text" name="form[name]" required="required"/>
+    <label for="form_name">Name</label>
+    <input type="text" name="form[name]" id="form_name" required="required"/>
 </form>
 XML
             , $formElement);