From 2324fa93d5720bebb8027d9ebb9d88b21389c8d1 Mon Sep 17 00:00:00 2001
From: Maxime Fabre <ehtnam6@gmail.com>
Date: Sun, 3 Aug 2014 12:53:57 +0200
Subject: [PATCH] Code cleanup

---
 src/Former/Facades/Former.php                |   24 +-
 src/Former/Form/Actions.php                  |  211 ++--
 src/Former/Form/Elements.php                 |  156 +--
 src/Former/Form/Fields/Button.php            |  179 +--
 src/Former/Form/Fields/Checkbox.php          |   42 +-
 src/Former/Form/Fields/File.php              |  249 ++---
 src/Former/Form/Fields/Hidden.php            |   52 +-
 src/Former/Form/Fields/Input.php             |  278 ++---
 src/Former/Form/Fields/Radio.php             |   33 +-
 src/Former/Form/Fields/Select.php            |  565 +++++-----
 src/Former/Form/Fields/Textarea.php          |   24 +-
 src/Former/Form/Fields/Uneditable.php        |   29 +-
 src/Former/Form/Form.php                     |  781 ++++++-------
 src/Former/Form/Group.php                    |  904 +++++++--------
 src/Former/Former.php                        |  870 +++++++--------
 src/Former/FormerServiceProvider.php         |  312 +++---
 src/Former/Framework/Nude.php                |  319 +++---
 src/Former/Framework/TwitterBootstrap.php    |  689 ++++++------
 src/Former/Framework/TwitterBootstrap3.php   |  803 +++++++-------
 src/Former/Framework/ZurbFoundation.php      |  510 ++++-----
 src/Former/Framework/ZurbFoundation4.php     |  515 ++++-----
 src/Former/Helpers.php                       |  285 ++---
 src/Former/Interfaces/FieldInterface.php     |   12 +-
 src/Former/Interfaces/FrameworkInterface.php |  232 ++--
 src/Former/LiveValidation.php                |  663 +++++------
 src/Former/MethodDispatcher.php              |  455 ++++----
 src/Former/Populator.php                     |  304 +++---
 src/Former/Traits/Checkable.php              |  973 +++++++++--------
 src/Former/Traits/Field.php                  |  730 ++++++-------
 src/Former/Traits/FormerObject.php           |  293 ++---
 src/Former/Traits/Framework.php              |  596 +++++-----
 src/Laravel/File.php                         |  231 ++--
 src/config/ZurbFoundation.php                |    2 +-
 tests/ActionsTest.php                        |  183 ++--
 tests/Dummy/DummyButton.php                  |   16 +-
 tests/Dummy/DummyEloquent.php                |   46 +-
 tests/Dummy/DummyToArray.php                 |   18 +-
 tests/Fields/ButtonTest.php                  |  181 ++--
 tests/Fields/CheckboxTest.php                | 1025 +++++++++---------
 tests/Fields/FileTest.php                    |  238 ++--
 tests/Fields/HiddenTest.php                  |   34 +-
 tests/Fields/InputTest.php                   |  576 +++++-----
 tests/Fields/RadioTest.php                   |  534 ++++-----
 tests/Fields/SelectTest.php                  |  858 +++++++--------
 tests/Fields/TextareaTest.php                |  110 +-
 tests/Fields/UneditableTest.php              |  139 ++-
 tests/FormTest.php                           |  631 +++++------
 tests/FormerTest.php                         |  202 ++--
 tests/Framework/FrameworkTest.php            |   36 +-
 tests/Framework/NudeFrameworkTest.php        |   51 +-
 tests/Framework/TwitterBootstrap3Test.php    |  398 +++----
 tests/Framework/TwitterBootstrapTest.php     |  102 +-
 tests/Framework/ZurbFramework4Test.php       |  270 +++--
 tests/Framework/ZurbFrameworkTest.php        |  197 ++--
 tests/GroupTest.php                          |  686 ++++++------
 tests/HelpersTest.php                        |   78 +-
 tests/LiveValidationTest.php                 |  806 +++++++-------
 tests/PopulatorTest.php                      |  209 ++--
 tests/TestCases/ContainerTestCase.php        |  522 ++++-----
 tests/TestCases/FormerTests.php              |  563 +++++-----
 tests/Traits/FieldTest.php                   |  374 +++----
 61 files changed, 10817 insertions(+), 10587 deletions(-)

diff --git a/src/Former/Facades/Former.php b/src/Former/Facades/Former.php
index 5b6dfa8c..17cb2b2a 100644
--- a/src/Former/Facades/Former.php
+++ b/src/Former/Facades/Former.php
@@ -9,17 +9,17 @@
  */
 class Former extends Facade
 {
-  /**
-   * Get the registered component.
-   *
-   * @return object
-   */
-  protected static function getFacadeAccessor()
-  {
-    if (!static::$app) {
-      static::$app = FormerServiceProvider::make();
-    }
+	/**
+	 * Get the registered component.
+	 *
+	 * @return object
+	 */
+	protected static function getFacadeAccessor()
+	{
+		if (!static::$app) {
+			static::$app = FormerServiceProvider::make();
+		}
 
-    return 'former';
-  }
+		return 'former';
+	}
 }
diff --git a/src/Former/Form/Actions.php b/src/Former/Form/Actions.php
index 76aa8669..c5d1a695 100644
--- a/src/Former/Form/Actions.php
+++ b/src/Former/Form/Actions.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Form;
 
-use Former\Former;
 use Former\Traits\FormerObject;
 use Illuminate\Container\Container;
 use Illuminate\Support\Str;
@@ -12,108 +11,110 @@
  */
 class Actions extends FormerObject
 {
-  /**
-   * The Container
-   *
-   * @var Container
-   */
-  protected $app;
-
-  /**
-   * The Actions element
-   *
-   * @var string
-   */
-  protected $element = 'div';
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Constructs a new Actions block
-   *
-   * @param Container $app
-   * @param array     $value The block content
-   */
-  public function __construct(Container $app, $value)
-  {
-    $this->app   = $app;
-    $this->value = $value;
-
-    // Add specific actions classes to the actions block
-    $this->addClass($this->app['former.framework']->getActionClasses());
-  }
-
-  /**
-   * Get the content of the Actions block
-   *
-   * @return string
-   */
-  public function getContent()
-  {
-    $content = array_map(function ($content) {
-      return method_exists($content, '__toString') ? (string) $content : $content;
-    }, $this->value);
-
-    return $this->app['former.framework']->wrapActions( implode(' ', $content) );
-  }
-
-  /**
-   * Dynamically append actions to the block
-   *
-   * @param string $method     The method
-   * @param array  $parameters Its parameters
-   *
-   * @return Actions
-   */
-  public function __call($method, $parameters)
-  {
-    // Dynamically add buttons to an actions block
-    if ($this->isButtonMethod($method)) {
-      $text       = array_get($parameters, 0);
-      $link       = array_get($parameters, 1);
-      $attributes = array_get($parameters, 2);
-      if (!$attributes and is_array($link)) $attributes = $link;
-      return $this->createButtonOfType($method, $text, $link, $attributes);
-    }
-
-    return parent::__call($method, $parameters);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// HELPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Create a new Button and add it to the actions
-   *
-   * @param string $type       The button type
-   * @param string $name       Its name
-   * @param string $link       A link to point to
-   * @param array  $attributes Its attributes
-   *
-   * @return Actions
-   */
-  private function createButtonOfType($type, $name, $link, $attributes)
-  {
-    $this->value[] = $this->app['former']->$type($name, $link, $attributes)->__toString();
-
-    return $this;
-  }
-
-  /**
-   * Check if a given method calls a button or not
-   *
-   * @param string $method The method to check
-   *
-   * @return boolean
-   */
-  private function isButtonMethod($method)
-  {
-    $buttons = array('button', 'submit', 'link', 'reset');
-
-    return (bool) Str::contains($method, $buttons);
-  }
-
+	/**
+	 * The Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
+
+	/**
+	 * The Actions element
+	 *
+	 * @var string
+	 */
+	protected $element = 'div';
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Constructs a new Actions block
+	 *
+	 * @param Container $app
+	 * @param array     $value The block content
+	 */
+	public function __construct(Container $app, $value)
+	{
+		$this->app   = $app;
+		$this->value = $value;
+
+		// Add specific actions classes to the actions block
+		$this->addClass($this->app['former.framework']->getActionClasses());
+	}
+
+	/**
+	 * Get the content of the Actions block
+	 *
+	 * @return string
+	 */
+	public function getContent()
+	{
+		$content = array_map(function ($content) {
+			return method_exists($content, '__toString') ? (string) $content : $content;
+		}, $this->value);
+
+		return $this->app['former.framework']->wrapActions(implode(' ', $content));
+	}
+
+	/**
+	 * Dynamically append actions to the block
+	 *
+	 * @param string $method     The method
+	 * @param array  $parameters Its parameters
+	 *
+	 * @return Actions
+	 */
+	public function __call($method, $parameters)
+	{
+		// Dynamically add buttons to an actions block
+		if ($this->isButtonMethod($method)) {
+			$text       = array_get($parameters, 0);
+			$link       = array_get($parameters, 1);
+			$attributes = array_get($parameters, 2);
+			if (!$attributes and is_array($link)) {
+				$attributes = $link;
+			}
+
+			return $this->createButtonOfType($method, $text, $link, $attributes);
+		}
+
+		return parent::__call($method, $parameters);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// HELPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Create a new Button and add it to the actions
+	 *
+	 * @param string $type       The button type
+	 * @param string $name       Its name
+	 * @param string $link       A link to point to
+	 * @param array  $attributes Its attributes
+	 *
+	 * @return Actions
+	 */
+	private function createButtonOfType($type, $name, $link, $attributes)
+	{
+		$this->value[] = $this->app['former']->$type($name, $link, $attributes)->__toString();
+
+		return $this;
+	}
+
+	/**
+	 * Check if a given method calls a button or not
+	 *
+	 * @param string $method The method to check
+	 *
+	 * @return boolean
+	 */
+	private function isButtonMethod($method)
+	{
+		$buttons = array('button', 'submit', 'link', 'reset');
+
+		return (bool) Str::contains($method, $buttons);
+	}
 }
diff --git a/src/Former/Form/Elements.php b/src/Former/Form/Elements.php
index 0b3cf122..51154b60 100644
--- a/src/Former/Form/Elements.php
+++ b/src/Former/Form/Elements.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Form;
 
-use Former\Former;
 use Former\Helpers;
 use HtmlObject\Element;
 use Illuminate\Container\Container;
@@ -12,93 +11,94 @@
  */
 class Elements
 {
-  /**
-   * The Container
-   *
-   * @var Container
-   */
-  protected $app;
+	/**
+	 * The Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
 
-  /**
-   * The Session instance
-   *
-   * @var Session
-   */
-  protected $session;
+	/**
+	 * The Session instance
+	 *
+	 * @var Session
+	 */
+	protected $session;
 
-  /**
-   * Build a new Element
-   *
-   * @param Container $app
-   */
-  public function __construct(Container $app, $session)
-  {
-    $this->app     = $app;
-    $this->session = $session;
-  }
+	/**
+	 * Build a new Element
+	 *
+	 * @param Container $app
+	 */
+	public function __construct(Container $app, $session)
+	{
+		$this->app     = $app;
+		$this->session = $session;
+	}
 
-  /**
-   * Generate a hidden field containing the current CSRF token.
-   *
-   * @return string
-   */
-  public function token()
-  {
-    $csrf = $this->session->getToken();
+	/**
+	 * Generate a hidden field containing the current CSRF token.
+	 *
+	 * @return string
+	 */
+	public function token()
+	{
+		$csrf = $this->session->getToken();
 
-    return (string) $this->app['former']->hidden('_token', $csrf);
-  }
+		return (string) $this->app['former']->hidden('_token', $csrf);
+	}
 
-  /**
-   * Creates a label tag
-   *
-   * @param  string $label      The label content
-   * @param  string $for        The field the label's for
-   * @param  array  $attributes The label's attributes
-   * @return string             A <label> tag
-   */
-  public function label($label, $for = null, $attributes = array())
-  {
-    $oldLabel = (string) $label;
-    $label    = Helpers::translate($oldLabel);
+	/**
+	 * Creates a label tag
+	 *
+	 * @param  string $label      The label content
+	 * @param  string $for        The field the label's for
+	 * @param  array  $attributes The label's attributes
+	 *
+	 * @return string             A <label> tag
+	 */
+	public function label($label, $for = null, $attributes = array())
+	{
+		$oldLabel = (string) $label;
+		$label    = Helpers::translate($oldLabel);
 
-    // If there was no change to the label,
-    // then a Laravel translation did not occur
-    if (lcfirst($label) == $oldLabel) {
-      $label = str_replace('_', ' ', $label);
-    }
+		// If there was no change to the label,
+		// then a Laravel translation did not occur
+		if (lcfirst($label) == $oldLabel) {
+			$label = str_replace('_', ' ', $label);
+		}
 
-    $attributes['for'] = $for;
-    $this->app['former']->labels[] = $for;
+		$attributes['for']             = $for;
+		$this->app['former']->labels[] = $for;
 
-    return Element::create('label', $label, $attributes);
-  }
+		return Element::create('label', $label, $attributes);
+	}
 
-  /**
-   * Creates a form legend
-   *
-   * @param  string $legend     The text
-   * @param  array  $attributes Its attributes
-   * @return string             A <legend> tag
-   */
-  public function legend($legend, $attributes = array())
-  {
-    $legend = Helpers::translate($legend);
+	/**
+	 * Creates a form legend
+	 *
+	 * @param  string $legend     The text
+	 * @param  array  $attributes Its attributes
+	 *
+	 * @return string             A <legend> tag
+	 */
+	public function legend($legend, $attributes = array())
+	{
+		$legend = Helpers::translate($legend);
 
-    return Element::create('legend', $legend, $attributes);
-  }
+		return Element::create('legend', $legend, $attributes);
+	}
 
-  /**
-   * Close a field group
-   *
-   * @return string
-   */
-  public function closeGroup()
-  {
-    // Close custom group
-    Group::$opened = false;
-
-    return '</div>';
-  }
+	/**
+	 * Close a field group
+	 *
+	 * @return string
+	 */
+	public function closeGroup()
+	{
+		// Close custom group
+		Group::$opened = false;
 
+		return '</div>';
+	}
 }
diff --git a/src/Former/Form/Fields/Button.php b/src/Former/Form/Fields/Button.php
index a73c5af4..97c3983d 100644
--- a/src/Former/Form/Fields/Button.php
+++ b/src/Former/Form/Fields/Button.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Form\Fields;
 
-use Former\Former;
 use Former\Helpers;
 use Former\Traits\Field;
 use Illuminate\Container\Container;
@@ -11,103 +10,105 @@
  */
 class Button extends Field
 {
-  /**
-   * The Button default element
-   *
-   * @var string
-   */
-  protected $element = 'input';
+	/**
+	 * The Button default element
+	 *
+	 * @var string
+	 */
+	protected $element = 'input';
 
-  /**
-   * Default value for self-closing
-   *
-   * @var boolean
-   */
-  protected $isSelfClosing = true;
+	/**
+	 * Default value for self-closing
+	 *
+	 * @var boolean
+	 */
+	protected $isSelfClosing = true;
 
-  /**
-   * A list of class properties to be added to attributes
-   *
-   * @var array
-   */
-  protected $injectedProperties = array(
-    'name', 'type', 'value',
-  );
+	/**
+	 * A list of class properties to be added to attributes
+	 *
+	 * @var array
+	 */
+	protected $injectedProperties = array(
+		'name',
+		'type',
+		'value',
+	);
 
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Easier arguments order for button fields
-   *
-   * @param Container $app        The Container
-   * @param string    $type       button/submit/reset/etc
-   * @param string    $value      The text of the button
-   * @param string    $link       Its link
-   * @param array     $attributes Its attributes
-   */
-  public function __construct(Container $app, $type, $value, $link, $attributes)
-  {
-    $this->app        = $app;
-    $this->attributes = (array) $attributes;
-    $this->type       = $type;
-    $this->value($value);
+	/**
+	 * Easier arguments order for button fields
+	 *
+	 * @param Container $app        The Container
+	 * @param string    $type       button/submit/reset/etc
+	 * @param string    $value      The text of the button
+	 * @param string    $link       Its link
+	 * @param array     $attributes Its attributes
+	 */
+	public function __construct(Container $app, $type, $value, $link, $attributes)
+	{
+		$this->app        = $app;
+		$this->attributes = (array) $attributes;
+		$this->type       = $type;
+		$this->value($value);
 
-    // Set correct element for the various button patterns
-    switch ($type) {
-      case 'button':
-        $this->element       = 'button';
-        $this->isSelfClosing = false;
-        break;
-      case 'link':
-        $this->type               = null;
-        $this->element            = 'a';
-        $this->attributes['href'] = $link;
-        $this->isSelfClosing      = false;
-        break;
-    }
-  }
+		// Set correct element for the various button patterns
+		switch ($type) {
+			case 'button':
+				$this->element       = 'button';
+				$this->isSelfClosing = false;
+				break;
+			case 'link':
+				$this->type               = null;
+				$this->element            = 'a';
+				$this->attributes['href'] = $link;
+				$this->isSelfClosing      = false;
+				break;
+		}
+	}
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// FIELD METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Check if the field is a button
-   *
-   * @return boolean
-   */
-  public function isButton()
-  {
-    return true;
-  }
+	/**
+	 * Check if the field is a button
+	 *
+	 * @return boolean
+	 */
+	public function isButton()
+	{
+		return true;
+	}
 
-  /**
-   * Prepend an icon to the button
-   *
-   * @param  string $icon
-   * @param  array  $attributes
-   *
-   * @return self
-   */
-  public function icon($icon, $attributes = array())
-  {
-    $icon = $this->app['former.framework']->createIcon($icon, $attributes);
-    $this->value = $icon. ' ' .$this->value;
+	/**
+	 * Prepend an icon to the button
+	 *
+	 * @param  string $icon
+	 * @param  array  $attributes
+	 *
+	 * @return self
+	 */
+	public function icon($icon, $attributes = array())
+	{
+		$icon        = $this->app['former.framework']->createIcon($icon, $attributes);
+		$this->value = $icon.' '.$this->value;
 
-    return $this;
-  }
+		return $this;
+	}
 
-  /**
-   * Hijack Former's Object model value method
-   *
-   * @param  string $value The new button text
-   */
-  public function value($value)
-  {
-    $this->value = Helpers::translate($value);
+	/**
+	 * Hijack Former's Object model value method
+	 *
+	 * @param  string $value The new button text
+	 */
+	public function value($value)
+	{
+		$this->value = Helpers::translate($value);
 
-    return $this;
-  }
+		return $this;
+	}
 }
diff --git a/src/Former/Form/Fields/Checkbox.php b/src/Former/Form/Fields/Checkbox.php
index 1eac8ab0..7bf23137 100644
--- a/src/Former/Form/Fields/Checkbox.php
+++ b/src/Former/Form/Fields/Checkbox.php
@@ -8,28 +8,28 @@
  */
 class Checkbox extends Checkable
 {
-  /**
-   * The current checkable type
-   *
-   * @var string
-   */
-  protected $checkable = 'checkbox';
+	/**
+	 * The current checkable type
+	 *
+	 * @var string
+	 */
+	protected $checkable = 'checkbox';
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// FIELD METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Create a serie of checkboxes
-   */
-  public function checkboxes()
-  {
-    if ($this->isGrouped()) {
-      // Remove any possible items added by the Populator.
-      $this->items = array();
-    }
-    $this->items(func_get_args());
+	/**
+	 * Create a serie of checkboxes
+	 */
+	public function checkboxes()
+	{
+		if ($this->isGrouped()) {
+			// Remove any possible items added by the Populator.
+			$this->items = array();
+		}
+		$this->items(func_get_args());
 
-    return $this;
-  }
+		return $this;
+	}
 }
diff --git a/src/Former/Form/Fields/File.php b/src/Former/Form/Fields/File.php
index 063eccf5..e7f9662b 100644
--- a/src/Former/Form/Fields/File.php
+++ b/src/Former/Form/Fields/File.php
@@ -3,8 +3,8 @@
 
 use Former\Traits\Field;
 use HtmlObject\Input as HtmlInput;
-use Laravel\File as LaravelFile;
 use Illuminate\Container\Container;
+use Laravel\File as LaravelFile;
 
 /**
  * Class for file fields
@@ -12,126 +12,129 @@
 class File extends Field
 {
 
-  /**
-   * The maximum file size
-   *
-   * @var integer
-   */
-  private $maxSize;
-
-  /**
-   * An array of mime groups to use as shortcuts
-   *
-   * @var array
-   */
-  private $mimeGroups = array('audio', 'video', 'image');
-
-  /**
-   * A list of properties to be injected in the attributes
-   *
-   * @var array
-   */
-  protected $injectedProperties = array('type', 'name');
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Easier arguments order for hidden fields
-   *
-   * @param Container $app        The Illuminate Container
-   * @param string    $type       file
-   * @param string    $name       Field name
-   * @param string    $label      Its label
-   * @param string    $value      Its value
-   * @param array     $attributes Attributes
-   */
-  public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-  {
-    // Multiple files field
-    if ($type == 'files') {
-      $attributes['multiple'] = 'true';
-      $type = 'file';
-      $name = $name.'[]';
-    }
-
-    parent::__construct($app, $type, $name, $label, $value, $attributes);
-  }
-
-  /**
-   * Prints out the current tag
-   *
-   * @return string An input file tag
-   */
-  public function render()
-  {
-    // Maximum file size
-    $hidden = $this->maxSize
-      ? HtmlInput::hidden('MAX_FILE_SIZE', $this->maxSize)
-      : null;
-
-    return parent::render().$hidden;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// FIELD METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Set which types of files are accepted by the file input
-   *
-   * @param string $mimes A list of extensions/mimes/groups to accept
-   */
-  public function accept()
-  {
-    $mimes = array();
-
-    // Transform all extensions/groups to mime types
-    foreach (func_get_args() as $mime) {
-
-      // Shortcuts and extensions
-      if (in_array($mime, $this->mimeGroups)) $mime .= '/*';
-      $mime = LaravelFile::mime($mime, $mime);
-
-      $mimes[] = $mime;
-    }
-
-    // Add accept attribute by concatenating the mimes
-    $this->attributes['accept'] = implode('|', $mimes);
-
-    return $this;
-  }
-
-  /**
-   * Set a maximum size for files
-   *
-   * @param integer $size  A maximum size
-   * @param string  $units The size's unit
-   */
-  public function max($size, $units = 'KB')
-  {
-    // Bytes or bits ?
-    $unit = substr($units, -1);
-    $base = 1024;
-    if ($unit == 'b') $size = $size / 8;
-
-    // Convert
-    switch ($units[0]) {
-      case 'K':
-        $size = $size * $base;
-        break;
-      case 'M':
-        $size = $size * pow($base, 2);
-        break;
-      case 'G':
-        $size = $size * pow($base, 3);
-        break;
-    }
-
-    $this->maxSize = (int) $size;
-
-    return $this;
-  }
-
+	/**
+	 * The maximum file size
+	 *
+	 * @var integer
+	 */
+	private $maxSize;
+
+	/**
+	 * An array of mime groups to use as shortcuts
+	 *
+	 * @var array
+	 */
+	private $mimeGroups = array('audio', 'video', 'image');
+
+	/**
+	 * A list of properties to be injected in the attributes
+	 *
+	 * @var array
+	 */
+	protected $injectedProperties = array('type', 'name');
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Easier arguments order for hidden fields
+	 *
+	 * @param Container $app        The Illuminate Container
+	 * @param string    $type       file
+	 * @param string    $name       Field name
+	 * @param string    $label      Its label
+	 * @param string    $value      Its value
+	 * @param array     $attributes Attributes
+	 */
+	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+	{
+		// Multiple files field
+		if ($type == 'files') {
+			$attributes['multiple'] = 'true';
+			$type                   = 'file';
+			$name                   = $name.'[]';
+		}
+
+		parent::__construct($app, $type, $name, $label, $value, $attributes);
+	}
+
+	/**
+	 * Prints out the current tag
+	 *
+	 * @return string An input file tag
+	 */
+	public function render()
+	{
+		// Maximum file size
+		$hidden = $this->maxSize
+			? HtmlInput::hidden('MAX_FILE_SIZE', $this->maxSize)
+			: null;
+
+		return parent::render().$hidden;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Set which types of files are accepted by the file input
+	 *
+	 * @param string $mimes A list of extensions/mimes/groups to accept
+	 */
+	public function accept()
+	{
+		$mimes = array();
+
+		// Transform all extensions/groups to mime types
+		foreach (func_get_args() as $mime) {
+
+			// Shortcuts and extensions
+			if (in_array($mime, $this->mimeGroups)) {
+				$mime .= '/*';
+			}
+			$mime = LaravelFile::mime($mime, $mime);
+
+			$mimes[] = $mime;
+		}
+
+		// Add accept attribute by concatenating the mimes
+		$this->attributes['accept'] = implode('|', $mimes);
+
+		return $this;
+	}
+
+	/**
+	 * Set a maximum size for files
+	 *
+	 * @param integer $size  A maximum size
+	 * @param string  $units The size's unit
+	 */
+	public function max($size, $units = 'KB')
+	{
+		// Bytes or bits ?
+		$unit = substr($units, -1);
+		$base = 1024;
+		if ($unit == 'b') {
+			$size = $size / 8;
+		}
+
+		// Convert
+		switch ($units[0]) {
+			case 'K':
+				$size = $size * $base;
+				break;
+			case 'M':
+				$size = $size * pow($base, 2);
+				break;
+			case 'G':
+				$size = $size * pow($base, 3);
+				break;
+		}
+
+		$this->maxSize = (int) $size;
+
+		return $this;
+	}
 }
diff --git a/src/Former/Form/Fields/Hidden.php b/src/Former/Form/Fields/Hidden.php
index 7be0ae3c..0a5f54c8 100644
--- a/src/Former/Form/Fields/Hidden.php
+++ b/src/Former/Form/Fields/Hidden.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Form\Fields;
 
-use Former\Former;
 use Former\Traits\Field;
 use HtmlObject\Input as HtmlInput;
 use Illuminate\Container\Container;
@@ -12,32 +11,31 @@
 class Hidden extends Field
 {
 
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Easier arguments order for hidden fields
-   *
-   * @param Container $app        The Container
-   * @param string    $type       hidden
-   * @param string    $name       Field names
-   * @param string    $value      Its value
-   * @param array     $attributes Attributes
-   */
-  public function __construct(Container $app, $type, $name, $value, $attributes)
-  {
-    parent::__construct($app, $type, $name, '', $value, $attributes);
-  }
-
-  /**
-   * Outputs a hidden field
-   *
-   * @return string An <input type="hidden" />
-   */
-  public function render()
-  {
-    return HtmlInput::create('hidden', $this->name, $this->value, $this->attributes)->render();
-  }
+	/**
+	 * Easier arguments order for hidden fields
+	 *
+	 * @param Container $app        The Container
+	 * @param string    $type       hidden
+	 * @param string    $name       Field names
+	 * @param string    $value      Its value
+	 * @param array     $attributes Attributes
+	 */
+	public function __construct(Container $app, $type, $name, $value, $attributes)
+	{
+		parent::__construct($app, $type, $name, '', $value, $attributes);
+	}
 
+	/**
+	 * Outputs a hidden field
+	 *
+	 * @return string An <input type="hidden" />
+	 */
+	public function render()
+	{
+		return HtmlInput::create('hidden', $this->name, $this->value, $this->attributes)->render();
+	}
 }
diff --git a/src/Former/Form/Fields/Input.php b/src/Former/Form/Fields/Input.php
index a5b9f94b..f2cbf315 100644
--- a/src/Former/Form/Fields/Input.php
+++ b/src/Former/Form/Fields/Input.php
@@ -10,140 +10,146 @@
  */
 class Input extends Field
 {
-  /**
-   * Current datalist stored
-   *
-   * @var array
-   */
-  protected $datalist = array();
-
-  /**
-   * Properties to be injected as attributes
-   *
-   * @var array
-   */
-  protected $injectedProperties = array('type', 'name', 'value');
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Build an input field
-   *
-   * @param Container $app        The Container
-   * @param string    $type       The input type
-   * @param string    $name       Field name
-   * @param string    $label      Its label
-   * @param string    $value      Its value
-   * @param array     $attributes Attributes
-   */
-  public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-  {
-    parent::__construct($app, $type, $name, $label, $value, $attributes);
-
-    // Multiple models population
-    if (is_array($this->value)) {
-      $values = array();
-      foreach($this->value as $value) $values[] = is_object($value) ? $value->__toString() : $value;
-      if (isset($values)) $this->value = implode(', ', $values);
-    }
-  }
-
-  /**
-   * Prints out the current tag
-   *
-   * @return string An input tag
-   */
-  public function render()
-  {
-    // Particular case of the search element
-    if ($this->isOfType('search')) $this->asSearch();
-
-    $this->setId();
-
-    // Render main input
-    $input = parent::render();
-
-    // If we have a datalist to append, print it out
-    if ($this->datalist) {
-      $input .= $this->createDatalist($this->list, $this->datalist);
-    }
-
-    return $input;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// FIELD METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Adds a datalist to the current field
-   *
-   * @param  array  $datalist An array to use a source
-   * @param  string $value    The field to use as value
-   * @param  string $key      The field to use as key
-   */
-  public function useDatalist($datalist, $value = null, $key = null)
-  {
-    $datalist = Helpers::queryToArray($datalist, $value, $key);
-
-    $list = $this->list ?: 'datalist_'.$this->name;
-
-    // Create the link to the datalist
-    $this->list = $list;
-    $this->datalist = $datalist;
-
-    return $this;
-  }
-
-  /**
-   * Add range to the input
-   *
-   * @param  integer $min
-   * @param  integer $max
-   *
-   * @return self
-   */
-  public function range($min, $max)
-  {
-    $this->min($min);
-    $this->max($max);
-
-    return $this;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////////// HELPERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Render a text element as a search element
-   */
-  private function asSearch()
-  {
-    $this->type = 'text';
-    $this->addClass('search-query');
-
-    return $this;
-  }
-
-  /**
-   * Renders a datalist
-   *
-   * @param string $id     The datalist's id attribute
-   * @param array  $values Its values
-   *
-   * @return string A <datalist> tag
-   */
-  private function createDatalist($id, $values)
-  {
-    $datalist = '<datalist id="' .$id. '">';
-      foreach ($values as $key => $value) {
-        $datalist .= '<option value="' .$value. '">' .$key. '</option>';
-      }
-    $datalist .= '</datalist>';
-
-    return $datalist;
-  }
+	/**
+	 * Current datalist stored
+	 *
+	 * @var array
+	 */
+	protected $datalist = array();
+
+	/**
+	 * Properties to be injected as attributes
+	 *
+	 * @var array
+	 */
+	protected $injectedProperties = array('type', 'name', 'value');
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Build an input field
+	 *
+	 * @param Container $app        The Container
+	 * @param string    $type       The input type
+	 * @param string    $name       Field name
+	 * @param string    $label      Its label
+	 * @param string    $value      Its value
+	 * @param array     $attributes Attributes
+	 */
+	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+	{
+		parent::__construct($app, $type, $name, $label, $value, $attributes);
+
+		// Multiple models population
+		if (is_array($this->value)) {
+			$values = array();
+			foreach ($this->value as $value) {
+				$values[] = is_object($value) ? $value->__toString() : $value;
+			}
+			if (isset($values)) {
+				$this->value = implode(', ', $values);
+			}
+		}
+	}
+
+	/**
+	 * Prints out the current tag
+	 *
+	 * @return string An input tag
+	 */
+	public function render()
+	{
+		// Particular case of the search element
+		if ($this->isOfType('search')) {
+			$this->asSearch();
+		}
+
+		$this->setId();
+
+		// Render main input
+		$input = parent::render();
+
+		// If we have a datalist to append, print it out
+		if ($this->datalist) {
+			$input .= $this->createDatalist($this->list, $this->datalist);
+		}
+
+		return $input;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Adds a datalist to the current field
+	 *
+	 * @param  array  $datalist An array to use a source
+	 * @param  string $value    The field to use as value
+	 * @param  string $key      The field to use as key
+	 */
+	public function useDatalist($datalist, $value = null, $key = null)
+	{
+		$datalist = Helpers::queryToArray($datalist, $value, $key);
+
+		$list = $this->list ?: 'datalist_'.$this->name;
+
+		// Create the link to the datalist
+		$this->list     = $list;
+		$this->datalist = $datalist;
+
+		return $this;
+	}
+
+	/**
+	 * Add range to the input
+	 *
+	 * @param  integer $min
+	 * @param  integer $max
+	 *
+	 * @return self
+	 */
+	public function range($min, $max)
+	{
+		$this->min($min);
+		$this->max($max);
+
+		return $this;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////////// HELPERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Render a text element as a search element
+	 */
+	private function asSearch()
+	{
+		$this->type = 'text';
+		$this->addClass('search-query');
+
+		return $this;
+	}
+
+	/**
+	 * Renders a datalist
+	 *
+	 * @param string $id     The datalist's id attribute
+	 * @param array  $values Its values
+	 *
+	 * @return string A <datalist> tag
+	 */
+	private function createDatalist($id, $values)
+	{
+		$datalist = '<datalist id="'.$id.'">';
+		foreach ($values as $key => $value) {
+			$datalist .= '<option value="'.$value.'">'.$key.'</option>';
+		}
+		$datalist .= '</datalist>';
+
+		return $datalist;
+	}
 }
diff --git a/src/Former/Form/Fields/Radio.php b/src/Former/Form/Fields/Radio.php
index bd7699a8..84be7c18 100644
--- a/src/Former/Form/Fields/Radio.php
+++ b/src/Former/Form/Fields/Radio.php
@@ -8,23 +8,24 @@
  */
 class Radio extends Checkable
 {
-  /**
-   * The current checkable type
-   * @var string
-   */
-  protected $checkable = 'radio';
+	/**
+	 * The current checkable type
+	 *
+	 * @var string
+	 */
+	protected $checkable = 'radio';
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// FIELD METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Create a serie of radios
-   */
-  public function radios()
-  {
-    $this->items(func_get_args());
+	/**
+	 * Create a serie of radios
+	 */
+	public function radios()
+	{
+		$this->items(func_get_args());
 
-    return $this;
-  }
+		return $this;
+	}
 }
diff --git a/src/Former/Form/Fields/Select.php b/src/Former/Form/Fields/Select.php
index df370e86..a57489e4 100644
--- a/src/Former/Form/Fields/Select.php
+++ b/src/Former/Form/Fields/Select.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Form\Fields;
 
-use Former\Former;
 use Former\Helpers;
 use Former\Traits\Field;
 use HtmlObject\Element;
@@ -13,282 +12,290 @@
 class Select extends Field
 {
 
-  /**
-   * The select's placeholder
-   * @var string
-   */
-  private $placeholder = null;
-
-  /**
-   * The Select's options
-   *
-   * @var array
-   */
-  protected $options;
-
-  /**
-   * The select's element
-   *
-   * @var string
-   */
-  protected $element = 'select';
-
-  /**
-   * The select's self-closing state
-   *
-   * @var boolean
-   */
-  protected $isSelfClosing = false;
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Easier arguments order for selects
-   *
-   * @param Container $app        The Container instance
-   * @param string    $type       select
-   * @param string    $name       Field name
-   * @param string    $label      Its label
-   * @param array     $options    The select's options
-   * @param string    $selected   The selected option
-   * @param array     $attributes Attributes
-   */
-  public function __construct(Container $app, $type, $name, $label, $options, $selected, $attributes)
-  {
-    if ($selected) $this->value = $selected;
-    if ($options)  $this->options($options);
-
-    parent::__construct($app, $type, $name, $label, $selected, $attributes);
-
-    // Nested models population
-    if (str_contains($this->name, '.') and is_array($this->value) and !empty($this->value) and is_string($this->value[key($this->value)])) {
-      $this->fromQuery($this->value);
-      $this->value = $selected ?: null;
-    }
-  }
-
-  /**
-   * Renders the select
-   *
-   * @return string A <select> tag
-   */
-  public function render()
-  {
-    // Multiselects
-    if ($this->isOfType('multiselect')) {
-      if (!isset($this->attributes['id'])) {
-        $this->setAttribute('id', $this->name);
-      }
-
-      $this->multiple();
-      $this->name .= '[]';
-    }
-
-    $this->value = (array) $this->value;
-
-    // Mark selected values as selected
-    if ($this->hasChildren() and !empty($this->value)) {
-      foreach ($this->value as $value) {
-        $this->selectValue($value);
-      }
-    }
-
-    // Add placeholder text if any
-    if ($placeholder = $this->getPlaceholder()) {
-      array_unshift($this->children, $placeholder);
-    }
-
-    $this->value = null;
-
-    return parent::render();
-  }
-
-  /**
-   * Select a value in the field's children
-   *
-   * @param mixed   $value
-   * @param Element $parent
-   *
-   * @return void
-   */
-  protected function selectValue($value, $parent = null)
-  {
-    // If no parent element defined, use direct children
-    if (!$parent) {
-      $parent = $this;
-    }
-
-    foreach ($parent->getChildren() as $child) {
-      // Search by value
-      if ($child->getAttribute('value') == $value) {
-        $child->selected('selected');
-      }
-
-      // Else iterate over subchilds
-      if ($child->hasChildren()) {
-        $this->selectValue($value, $child);
-      }
-    }
-  }
-
-  /**
-   * Get the Select's placeholder
-   *
-   * @return Element
-   */
-  protected function getPlaceholder()
-  {
-    if (!$this->placeholder) return false;
-
-    $attributes = array('value' => '', 'disabled' => 'disabled');
-    if (!$this->value) $attributes['selected'] = 'selected';
-    return Element::create('option', $this->placeholder, $attributes);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// FIELD METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Set the select options
-   *
-   * @param  array   $_options     The options as an array
-   * @param  mixed   $selected     Facultative selected entry
-   * @param  boolean $valuesAsKeys Whether the array's values should be used as
-   *                               the option's values instead of the array's keys
-   */
-  public function options($_options, $selected = null, $valuesAsKeys = false)
-  {
-    $options = array();
-
-    // If valuesAsKeys is true, use the values as keys
-    if ($valuesAsKeys) {
-      foreach ($_options as $v) {
-        $options[$v] = $v;
-      }
-    } else {
-      $options = $_options;
-    }
-
-    // Add the various options
-    foreach ($options as $value => $text) {
-      if (is_array($text) and isset($text['value'])) {
-        $attributes = $text;
-        $text       = $value;
-        $value      = null;
-      } else {
-        $attributes = array();
-      }
-      $this->addOption($text, $value, $attributes);
-    }
-
-    // Set the selected value
-    if (!is_null($selected)) {
-      $this->select($selected);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Creates a list of options from a range
-   *
-   * @param  integer $from
-   * @param  integer $to
-   * @param  integer $step
-   */
-  public function range($from, $to, $step = 1)
-  {
-    $range = range($from, $to, $step);
-    $this->options($range, null, true);
-
-    return $this;
-  }
-
-  /**
-   * Add an option to the Select's options
-   *
-   * @param array|string $text       It's value or an array of values
-   * @param string       $value      It's text
-   * @param array        $attributes The option's attributes
-   */
-  public function addOption($text = null, $value = null, $attributes = array())
-  {
-    // Get the option's value
-    $childrenKey = !is_null($value) ? $value : sizeof($this->children);
-
-    // If we passed an options group
-    if (is_array($text)) {
-      $this->children[$childrenKey] = Element::create('optgroup')->label($value);
-      foreach ($text as $key => $value) {
-        $option = Element::create('option', $value)->setAttribute('value', $key);
-        $this->children[$childrenKey]->nest($option);
-      }
-
-    // Else if it's a simple option
-    } else {
-      if (!isset($attributes['value'])) {
-        $attributes['value'] = $value;
-      }
-
-      $this->children[$attributes['value']] = Element::create('option', $text)->setAttributes($attributes);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Use the results from a Fluent/Eloquent query as options
-   *
-   * @param  array  $results  An array of Eloquent models
-   * @param  string $value    The attribute to use as text
-   * @param  string $key      The attribute to use as value
-   */
-  public function fromQuery($results, $value = null, $key = null)
-  {
-    $this->options(Helpers::queryToArray($results, $value, $key));
-
-    return $this;
-  }
-
-  /**
-   * Select a particular list item
-   *
-   * @param  mixed $selected Selected item
-   */
-  public function select($selected)
-  {
-    $this->value = $selected;
-
-    return $this;
-  }
-
-  /**
-   * Add a placeholder to the current select
-   *
-   * @param  string $placeholder The placeholder text
-   */
-  public function placeholder($placeholder)
-  {
-    $this->placeholder = Helpers::translate($placeholder);
-
-    return $this;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// HELPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Returns the current options in memory for manipulations
-   *
-   * @return array The current options array
-   */
-  public function getOptions()
-  {
-    return $this->children;
-  }
-
+	/**
+	 * The select's placeholder
+	 *
+	 * @var string
+	 */
+	private $placeholder = null;
+
+	/**
+	 * The Select's options
+	 *
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * The select's element
+	 *
+	 * @var string
+	 */
+	protected $element = 'select';
+
+	/**
+	 * The select's self-closing state
+	 *
+	 * @var boolean
+	 */
+	protected $isSelfClosing = false;
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Easier arguments order for selects
+	 *
+	 * @param Container $app        The Container instance
+	 * @param string    $type       select
+	 * @param string    $name       Field name
+	 * @param string    $label      Its label
+	 * @param array     $options    The select's options
+	 * @param string    $selected   The selected option
+	 * @param array     $attributes Attributes
+	 */
+	public function __construct(Container $app, $type, $name, $label, $options, $selected, $attributes)
+	{
+		if ($selected) {
+			$this->value = $selected;
+		}
+		if ($options) {
+			$this->options($options);
+		}
+
+		parent::__construct($app, $type, $name, $label, $selected, $attributes);
+
+		// Nested models population
+		if (str_contains($this->name, '.') and is_array($this->value) and !empty($this->value) and is_string($this->value[key($this->value)])) {
+			$this->fromQuery($this->value);
+			$this->value = $selected ?: null;
+		}
+	}
+
+	/**
+	 * Renders the select
+	 *
+	 * @return string A <select> tag
+	 */
+	public function render()
+	{
+		// Multiselects
+		if ($this->isOfType('multiselect')) {
+			if (!isset($this->attributes['id'])) {
+				$this->setAttribute('id', $this->name);
+			}
+
+			$this->multiple();
+			$this->name .= '[]';
+		}
+
+		$this->value = (array) $this->value;
+
+		// Mark selected values as selected
+		if ($this->hasChildren() and !empty($this->value)) {
+			foreach ($this->value as $value) {
+				$this->selectValue($value);
+			}
+		}
+
+		// Add placeholder text if any
+		if ($placeholder = $this->getPlaceholder()) {
+			array_unshift($this->children, $placeholder);
+		}
+
+		$this->value = null;
+
+		return parent::render();
+	}
+
+	/**
+	 * Select a value in the field's children
+	 *
+	 * @param mixed   $value
+	 * @param Element $parent
+	 *
+	 * @return void
+	 */
+	protected function selectValue($value, $parent = null)
+	{
+		// If no parent element defined, use direct children
+		if (!$parent) {
+			$parent = $this;
+		}
+
+		foreach ($parent->getChildren() as $child) {
+			// Search by value
+			if ($child->getAttribute('value') == $value) {
+				$child->selected('selected');
+			}
+
+			// Else iterate over subchilds
+			if ($child->hasChildren()) {
+				$this->selectValue($value, $child);
+			}
+		}
+	}
+
+	/**
+	 * Get the Select's placeholder
+	 *
+	 * @return Element
+	 */
+	protected function getPlaceholder()
+	{
+		if (!$this->placeholder) {
+			return false;
+		}
+
+		$attributes = array('value' => '', 'disabled' => 'disabled');
+		if (!$this->value) {
+			$attributes['selected'] = 'selected';
+		}
+
+		return Element::create('option', $this->placeholder, $attributes);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Set the select options
+	 *
+	 * @param  array   $_options     The options as an array
+	 * @param  mixed   $selected     Facultative selected entry
+	 * @param  boolean $valuesAsKeys Whether the array's values should be used as
+	 *                               the option's values instead of the array's keys
+	 */
+	public function options($_options, $selected = null, $valuesAsKeys = false)
+	{
+		$options = array();
+
+		// If valuesAsKeys is true, use the values as keys
+		if ($valuesAsKeys) {
+			foreach ($_options as $v) {
+				$options[$v] = $v;
+			}
+		} else {
+			$options = $_options;
+		}
+
+		// Add the various options
+		foreach ($options as $value => $text) {
+			if (is_array($text) and isset($text['value'])) {
+				$attributes = $text;
+				$text       = $value;
+				$value      = null;
+			} else {
+				$attributes = array();
+			}
+			$this->addOption($text, $value, $attributes);
+		}
+
+		// Set the selected value
+		if (!is_null($selected)) {
+			$this->select($selected);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Creates a list of options from a range
+	 *
+	 * @param  integer $from
+	 * @param  integer $to
+	 * @param  integer $step
+	 */
+	public function range($from, $to, $step = 1)
+	{
+		$range = range($from, $to, $step);
+		$this->options($range, null, true);
+
+		return $this;
+	}
+
+	/**
+	 * Add an option to the Select's options
+	 *
+	 * @param array|string $text       It's value or an array of values
+	 * @param string       $value      It's text
+	 * @param array        $attributes The option's attributes
+	 */
+	public function addOption($text = null, $value = null, $attributes = array())
+	{
+		// Get the option's value
+		$childrenKey = !is_null($value) ? $value : sizeof($this->children);
+
+		// If we passed an options group
+		if (is_array($text)) {
+			$this->children[$childrenKey] = Element::create('optgroup')->label($value);
+			foreach ($text as $key => $value) {
+				$option = Element::create('option', $value)->setAttribute('value', $key);
+				$this->children[$childrenKey]->nest($option);
+			}
+			// Else if it's a simple option
+		} else {
+			if (!isset($attributes['value'])) {
+				$attributes['value'] = $value;
+			}
+
+			$this->children[$attributes['value']] = Element::create('option', $text)->setAttributes($attributes);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Use the results from a Fluent/Eloquent query as options
+	 *
+	 * @param  array  $results An array of Eloquent models
+	 * @param  string $value   The attribute to use as text
+	 * @param  string $key     The attribute to use as value
+	 */
+	public function fromQuery($results, $value = null, $key = null)
+	{
+		$this->options(Helpers::queryToArray($results, $value, $key));
+
+		return $this;
+	}
+
+	/**
+	 * Select a particular list item
+	 *
+	 * @param  mixed $selected Selected item
+	 */
+	public function select($selected)
+	{
+		$this->value = $selected;
+
+		return $this;
+	}
+
+	/**
+	 * Add a placeholder to the current select
+	 *
+	 * @param  string $placeholder The placeholder text
+	 */
+	public function placeholder($placeholder)
+	{
+		$this->placeholder = Helpers::translate($placeholder);
+
+		return $this;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// HELPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Returns the current options in memory for manipulations
+	 *
+	 * @return array The current options array
+	 */
+	public function getOptions()
+	{
+		return $this->children;
+	}
 }
diff --git a/src/Former/Form/Fields/Textarea.php b/src/Former/Form/Fields/Textarea.php
index e448a941..0eade476 100644
--- a/src/Former/Form/Fields/Textarea.php
+++ b/src/Former/Form/Fields/Textarea.php
@@ -8,17 +8,17 @@
  */
 class Textarea extends Field
 {
-  /**
-   * The textarea's element
-   *
-   * @var string
-   */
-  protected $element = 'textarea';
+	/**
+	 * The textarea's element
+	 *
+	 * @var string
+	 */
+	protected $element = 'textarea';
 
-  /**
-   * The textarea's self-closing state
-   *
-   * @var boolean
-   */
-  protected $isSelfClosing = false;
+	/**
+	 * The textarea's self-closing state
+	 *
+	 * @var boolean
+	 */
+	protected $isSelfClosing = false;
 }
diff --git a/src/Former/Form/Fields/Uneditable.php b/src/Former/Form/Fields/Uneditable.php
index 91ce3a24..6b262119 100644
--- a/src/Former/Form/Fields/Uneditable.php
+++ b/src/Former/Form/Fields/Uneditable.php
@@ -9,22 +9,21 @@
 class Uneditable extends Field
 {
 
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Prints out the current tag
-   *
-   * @return string An uneditable input tag
-   */
-  public function render()
-  {
-    $this->addClass($this->app['former.framework']->getUneditableClasses());
+	/**
+	 * Prints out the current tag
+	 *
+	 * @return string An uneditable input tag
+	 */
+	public function render()
+	{
+		$this->addClass($this->app['former.framework']->getUneditableClasses());
 
-    $this->setId();
-
-    return $this->app['former.framework']->createDisabledField($this);
-  }
+		$this->setId();
 
+		return $this->app['former.framework']->createDisabledField($this);
+	}
 }
diff --git a/src/Former/Form/Form.php b/src/Former/Form/Form.php
index a3e72eda..963a660f 100644
--- a/src/Former/Form/Form.php
+++ b/src/Former/Form/Form.php
@@ -12,394 +12,395 @@
  */
 class Form extends FormerObject
 {
-  /**
-   * The IoC Container
-   *
-   * @var Container
-   */
-  protected $app;
-
-  /**
-   * The URL generator
-   *
-   * @var UrlGenerator
-   */
-  protected $url;
-
-  /**
-   * The Populator
-   *
-   * @var Populator
-   */
-  protected $populator;
-
-  /**
-   * The Form type
-   *
-   * @var string
-   */
-  protected $type = null;
-
-  /**
-   * The destination of the current form
-   *
-   * @var string
-   */
-  protected $action;
-
-  /**
-   * The form method
-   *
-   * @var string
-   */
-  protected $method;
-
-  /**
-   * Whether the form should be secured or not
-   *
-   * @var boolean
-   */
-  protected $secure;
-
-  /**
-   * The form element
-   *
-   * @var string
-   */
-  protected $element = 'form';
-
-  /**
-   * A list of injected properties
-   *
-   * @var array
-   */
-  protected $injectedProperties = array('method', 'action');
-
-  /**
-   * Whether a form is opened or not
-   *
-   * @var boolean
-   */
-  protected static $opened = false;
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Build a new Form instance
-   *
-   * @param Former       $former
-   * @param UrlGenerator $url
-   */
-  public function __construct(Container $app, $url, Populator $populator)
-  {
-    $this->app       = $app;
-    $this->url       = $url;
-    $this->populator = $populator;
-
-    $this->app->singleton('former.form.framework', function ($app) {
-      return clone $app['former.framework'];
-    });
-  }
-
-  /**
-   * Opens up magically a form
-   *
-   * @param  string $type       The form type asked
-   * @param  array  $parameters Parameters passed
-   * @return string             A form opening tag
-   */
-  public function openForm($type, $parameters)
-  {
-    $action     = array_get($parameters, 0);
-    $method     = array_get($parameters, 1, 'POST');
-    $attributes = array_get($parameters, 2, array());
-    $secure     = array_get($parameters, 3, false);
-
-    // Fetch errors if asked for
-    if ($this->app['former']->getOption('fetch_errors')) {
-      $this->app['former']->withErrors();
-    }
-
-    // Open the form
-    $this->action($action);
-    $this->attributes = $attributes;
-    $this->method     = strtoupper($method);
-    $this->secure     = $secure;
-
-    // Add any effect of the form type
-    $type = Str::snake($type);
-    $this->type = $this->applyType($type);
-
-    // Add enctype
-    if (!array_key_exists('accept-charset', $attributes )) {
-      $this->attributes['accept-charset'] = 'utf-8';
-    }
-
-    // Add supplementary classes
-    if ($this->type !== 'raw') {
-      $this->addClass($this->app['former.form.framework']->getFormClasses($this->type));
-    }
-
-    return $this;
-  }
-
-  /**
-   * Closes a Form
-   *
-   * @return string A closing <form> tag
-   */
-  public function close()
-  {
-    static::$opened = false;
-
-    // Add token if necessary
-    $closing = '</form>';
-    if ($this->method != 'GET') {
-      $closing = $this->app['former']->token().$closing;
-    }
-
-    return $closing;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// STATIC HELPERS ////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Whether a form is currently opened or not
-   *
-   * @return boolean
-   */
-  public static function hasInstanceOpened()
-  {
-    return static::$opened;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////////// SETTER /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Change the form's action
-   *
-   * @param  string $action The new action
-   */
-  public function action($action)
-  {
-    $this->action = $action ? $this->url->to($action, array(), $this->secure) : null;
-
-    return $this;
-  }
-
-  /**
-   * Change the form's method
-   *
-   * @param  string $method The method to use
-   */
-  public function method($method)
-  {
-    $this->method = strtoupper($method);
-
-    return $this;
-  }
-
-  /**
-   * Whether the form should be secure
-   *
-   * @param  boolean $secure Secure or not
-   */
-  public function secure($secure = true)
-  {
-    $this->secure = $secure;
-
-    return $this;
-  }
-
-  /**
-   * Change the form's action and method to a route
-   *
-   * @param  string $name   The name of the route to use
-   * @param  array  $params Any route parameters
-   *
-   * @return void
-   */
-  public function route($name, $params = array())
-  {
-    // Set the form action
-    $this->action = $this->url->route($name, $params);
-
-    // Set the proper method
-    if ($method = $this->findRouteMethod($name)) {
-      $this->method($method);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Change the form's action to a controller method
-   *
-   * @param  string $name         The controller and method
-   * @param  array  $params       Any method parameters
-   *
-   * @return void
-   */
-  public function controller($name, $params = array())
-  {
-    $this->action = $this->url->action($name, $params);
-
-    // Set the proper method
-    if ($method = $this->findRouteMethod($name)) {
-      $this->method($method);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Outputs the current form opened
-   *
-   * @return string A <form> opening tag
-   */
-  public function __toString()
-  {
-    // Mark the form as opened
-    static::$opened = true;
-
-    // Add name to attributes
-    $this->attributes['name'] = $this->name;
-
-    // Add spoof method
-    if (in_array($this->method, array('PUT', 'PATCH', 'DELETE'))) {
-      $spoof = $this->app['former']->hidden('_method', $this->method);
-      $this->method = 'POST';
-    } else {
-      $spoof = null;
-    }
-
-    return $this->open().$spoof;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// PUBLIC HELPERS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Alias for $this->app['former']->withRules
-   */
-  public function rules()
-  {
-    call_user_func_array(array($this->app['former'], 'withRules'), func_get_args());
-
-    return $this;
-  }
-
-  /**
-   * Populate a form with specific values
-   *
-   * @param array|object $values
-   */
-  public function populate($values)
-  {
-    $this->populator->replace($values);
-
-    return $this;
-  }
-
-  /**
-   * Get the Populator binded to the Form
-   *
-   * @return Populator
-   */
-  public function getPopulator()
-  {
-    return $this->populator;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// HELPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Find the method of a route by its _uses or name
-   *
-   * @param  string $name
-   *
-   * @return string
-   */
-  protected function findRouteMethod($name)
-  {
-    if (!$this->app->bound('router')) {
-      return;
-    }
-
-    // Get string by name
-    if (!Str::contains($name, '@')) {
-      $routes = $this->app['router']->getRoutes();
-      $route = method_exists($routes, 'getByName') ? $routes->getByName($name) : $routes->get($name);
-
-    // Get string by uses
-    } else {
-      foreach ($this->app['router']->getRoutes() as $route) {
-        $routeUses = method_exists($route, 'getOption') ? $route->getOption('_uses') : array_get($route->getAction(), 'controller');
-        if ($action = $routeUses) {
-          if ($action == $name) {
-            break;
-          }
-        }
-      }
-    }
-
-    // Get method
-    $methods = method_exists($route, 'getMethods') ? $route->getMethods() : $route->methods();
-    $method  = array_get($methods, 0);
-
-    return $method;
-  }
-
-  /**
-   * Apply various parameters according to form type
-   *
-   * @param  string $type The original form type provided
-   * @return string The final form type
-   */
-  private function applyType($type)
-  {
-    // If classic form
-    if ($type == 'open') {
-      return $this->app['former']->getOption('default_form_type');
-    }
-
-    // Look for HTTPS form
-    if (Str::contains($type, 'secure')) {
-      $type = str_replace('secure', '', $type);
-      $this->secure = true;
-    }
-
-    // Look for file form
-    if (Str::contains($type, 'for_files')) {
-      $type = str_replace('for_files', '', $type);
-      $this->attributes['enctype'] = 'multipart/form-data';
-    }
-
-    // Calculate form type
-    $type = str_replace('open', '', $type);
-    $type = trim($type, '_');
-
-    // If raw form
-    if ($type == 'raw') {
-      $this->app->bind('former.form.framework', function ($app) {
-        return $app['former']->getFrameworkInstance('Nude');
-      });
-    }
-
-    // Use default form type if the one provided is invalid
-    if ($type !== 'raw' and !in_array($type, $this->app['former.form.framework']->availableTypes())) {
-      $type = $this->app['former']->getOption('default_form_type');
-    }
-
-    return $type;
-  }
+	/**
+	 * The IoC Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
+
+	/**
+	 * The URL generator
+	 *
+	 * @var UrlGenerator
+	 */
+	protected $url;
+
+	/**
+	 * The Populator
+	 *
+	 * @var Populator
+	 */
+	protected $populator;
+
+	/**
+	 * The Form type
+	 *
+	 * @var string
+	 */
+	protected $type = null;
+
+	/**
+	 * The destination of the current form
+	 *
+	 * @var string
+	 */
+	protected $action;
+
+	/**
+	 * The form method
+	 *
+	 * @var string
+	 */
+	protected $method;
+
+	/**
+	 * Whether the form should be secured or not
+	 *
+	 * @var boolean
+	 */
+	protected $secure;
+
+	/**
+	 * The form element
+	 *
+	 * @var string
+	 */
+	protected $element = 'form';
+
+	/**
+	 * A list of injected properties
+	 *
+	 * @var array
+	 */
+	protected $injectedProperties = array('method', 'action');
+
+	/**
+	 * Whether a form is opened or not
+	 *
+	 * @var boolean
+	 */
+	protected static $opened = false;
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Build a new Form instance
+	 *
+	 * @param Former       $former
+	 * @param UrlGenerator $url
+	 */
+	public function __construct(Container $app, $url, Populator $populator)
+	{
+		$this->app       = $app;
+		$this->url       = $url;
+		$this->populator = $populator;
+
+		$this->app->singleton('former.form.framework', function ($app) {
+			return clone $app['former.framework'];
+		});
+	}
+
+	/**
+	 * Opens up magically a form
+	 *
+	 * @param  string $type       The form type asked
+	 * @param  array  $parameters Parameters passed
+	 *
+	 * @return string             A form opening tag
+	 */
+	public function openForm($type, $parameters)
+	{
+		$action     = array_get($parameters, 0);
+		$method     = array_get($parameters, 1, 'POST');
+		$attributes = array_get($parameters, 2, array());
+		$secure     = array_get($parameters, 3, false);
+
+		// Fetch errors if asked for
+		if ($this->app['former']->getOption('fetch_errors')) {
+			$this->app['former']->withErrors();
+		}
+
+		// Open the form
+		$this->action($action);
+		$this->attributes = $attributes;
+		$this->method     = strtoupper($method);
+		$this->secure     = $secure;
+
+		// Add any effect of the form type
+		$type       = Str::snake($type);
+		$this->type = $this->applyType($type);
+
+		// Add enctype
+		if (!array_key_exists('accept-charset', $attributes)) {
+			$this->attributes['accept-charset'] = 'utf-8';
+		}
+
+		// Add supplementary classes
+		if ($this->type !== 'raw') {
+			$this->addClass($this->app['former.form.framework']->getFormClasses($this->type));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Closes a Form
+	 *
+	 * @return string A closing <form> tag
+	 */
+	public function close()
+	{
+		static::$opened = false;
+
+		// Add token if necessary
+		$closing = '</form>';
+		if ($this->method != 'GET') {
+			$closing = $this->app['former']->token().$closing;
+		}
+
+		return $closing;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// STATIC HELPERS ////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Whether a form is currently opened or not
+	 *
+	 * @return boolean
+	 */
+	public static function hasInstanceOpened()
+	{
+		return static::$opened;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////////// SETTER /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Change the form's action
+	 *
+	 * @param  string $action The new action
+	 */
+	public function action($action)
+	{
+		$this->action = $action ? $this->url->to($action, array(), $this->secure) : null;
+
+		return $this;
+	}
+
+	/**
+	 * Change the form's method
+	 *
+	 * @param  string $method The method to use
+	 */
+	public function method($method)
+	{
+		$this->method = strtoupper($method);
+
+		return $this;
+	}
+
+	/**
+	 * Whether the form should be secure
+	 *
+	 * @param  boolean $secure Secure or not
+	 */
+	public function secure($secure = true)
+	{
+		$this->secure = $secure;
+
+		return $this;
+	}
+
+	/**
+	 * Change the form's action and method to a route
+	 *
+	 * @param  string $name   The name of the route to use
+	 * @param  array  $params Any route parameters
+	 *
+	 * @return void
+	 */
+	public function route($name, $params = array())
+	{
+		// Set the form action
+		$this->action = $this->url->route($name, $params);
+
+		// Set the proper method
+		if ($method = $this->findRouteMethod($name)) {
+			$this->method($method);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Change the form's action to a controller method
+	 *
+	 * @param  string $name   The controller and method
+	 * @param  array  $params Any method parameters
+	 *
+	 * @return void
+	 */
+	public function controller($name, $params = array())
+	{
+		$this->action = $this->url->action($name, $params);
+
+		// Set the proper method
+		if ($method = $this->findRouteMethod($name)) {
+			$this->method($method);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Outputs the current form opened
+	 *
+	 * @return string A <form> opening tag
+	 */
+	public function __toString()
+	{
+		// Mark the form as opened
+		static::$opened = true;
+
+		// Add name to attributes
+		$this->attributes['name'] = $this->name;
+
+		// Add spoof method
+		if (in_array($this->method, array('PUT', 'PATCH', 'DELETE'))) {
+			$spoof        = $this->app['former']->hidden('_method', $this->method);
+			$this->method = 'POST';
+		} else {
+			$spoof = null;
+		}
+
+		return $this->open().$spoof;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// PUBLIC HELPERS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Alias for $this->app['former']->withRules
+	 */
+	public function rules()
+	{
+		call_user_func_array(array($this->app['former'], 'withRules'), func_get_args());
+
+		return $this;
+	}
+
+	/**
+	 * Populate a form with specific values
+	 *
+	 * @param array|object $values
+	 */
+	public function populate($values)
+	{
+		$this->populator->replace($values);
+
+		return $this;
+	}
+
+	/**
+	 * Get the Populator binded to the Form
+	 *
+	 * @return Populator
+	 */
+	public function getPopulator()
+	{
+		return $this->populator;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// HELPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Find the method of a route by its _uses or name
+	 *
+	 * @param  string $name
+	 *
+	 * @return string
+	 */
+	protected function findRouteMethod($name)
+	{
+		if (!$this->app->bound('router')) {
+			return;
+		}
+
+		// Get string by name
+		if (!Str::contains($name, '@')) {
+			$routes = $this->app['router']->getRoutes();
+			$route  = method_exists($routes, 'getByName') ? $routes->getByName($name) : $routes->get($name);
+			// Get string by uses
+		} else {
+			foreach ($this->app['router']->getRoutes() as $route) {
+				$routeUses = method_exists($route, 'getOption') ? $route->getOption('_uses') : array_get($route->getAction(), 'controller');
+				if ($action = $routeUses) {
+					if ($action == $name) {
+						break;
+					}
+				}
+			}
+		}
+
+		// Get method
+		$methods = method_exists($route, 'getMethods') ? $route->getMethods() : $route->methods();
+		$method  = array_get($methods, 0);
+
+		return $method;
+	}
+
+	/**
+	 * Apply various parameters according to form type
+	 *
+	 * @param  string $type The original form type provided
+	 *
+	 * @return string The final form type
+	 */
+	private function applyType($type)
+	{
+		// If classic form
+		if ($type == 'open') {
+			return $this->app['former']->getOption('default_form_type');
+		}
+
+		// Look for HTTPS form
+		if (Str::contains($type, 'secure')) {
+			$type         = str_replace('secure', '', $type);
+			$this->secure = true;
+		}
+
+		// Look for file form
+		if (Str::contains($type, 'for_files')) {
+			$type                        = str_replace('for_files', '', $type);
+			$this->attributes['enctype'] = 'multipart/form-data';
+		}
+
+		// Calculate form type
+		$type = str_replace('open', '', $type);
+		$type = trim($type, '_');
+
+		// If raw form
+		if ($type == 'raw') {
+			$this->app->bind('former.form.framework', function ($app) {
+				return $app['former']->getFrameworkInstance('Nude');
+			});
+		}
+
+		// Use default form type if the one provided is invalid
+		if ($type !== 'raw' and !in_array($type, $this->app['former.form.framework']->availableTypes())) {
+			$type = $this->app['former']->getOption('default_form_type');
+		}
+
+		return $type;
+	}
 }
diff --git a/src/Former/Form/Group.php b/src/Former/Form/Group.php
index 74dc5385..ed87f5b7 100644
--- a/src/Former/Form/Group.php
+++ b/src/Former/Form/Group.php
@@ -2,466 +2,466 @@
 namespace Former\Form;
 
 use BadMethodCallException;
-use Former\Former;
 use Former\Helpers;
 use HtmlObject\Element;
 use HtmlObject\Traits\Tag;
 use Illuminate\Container\Container;
-use Illuminate\Support\Str;
 
 /**
  * Helper class to build groups
  */
 class Group extends Tag
 {
-  /**
-   * The Container
-   *
-   * @var Container
-   */
-  protected $app;
-
-  /**
-   * The current state of the group
-   *
-   * @var string
-   */
-  protected $state = null;
-
-  /**
-   * Whether the field should be displayed raw or not
-   *
-   * @var boolean
-   */
-  protected $raw = false;
-
-  /**
-   * The group label
-   *
-   * @var Element
-   */
-  protected $label;
-
-  /**
-   * The group help
-   *
-   * @var string
-   */
-  protected $help = null;
-
-  /**
-   * An array of elements to preprend the field
-   *
-   * @var array
-   */
-  protected $prepend = array();
-
-  /**
-   * An array of elements to append the field
-   *
-   * @var array
-   */
-  protected $append = array();
-
-  /**
-   * The field validations to be checked for errors
-   *
-   * @var array
-   */
-  protected $validations = array();
-
-  /**
-   * The group's element
-   *
-   * @var string
-   */
-  protected $element = 'div';
-
-  /**
-   * Whether a custom group is opened or not
-   *
-   * @var boolean
-   */
-  public static $opened = false;
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CORE METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Creates a group
-   *
-   * @param Container    $Container     The Container instance
-   * @param string    $label      Its label
-   * @param array     $attributes Attributes
-   */
-  public function __construct(Container $app, $label, $validations = null)
-  {
-    // Get special classes
-    $this->app = $app;
-    $this->addClass($this->app['former.framework']->getGroupClasses());
-
-    // Invisible if Nude
-    if ($this->app['former.framework']->is('Nude')) {
-      $this->element = '';
-    }
-
-    // Set group label
-    if ($label) {
-      $this->setLabel($label);
-    }
-
-    // Set validations used to override groups own conclusions
-    $this->validations = (array) $validations;
-  }
-
-  /**
-   * Prints out the opening of the Control Group
-   *
-   * @return string A control group opening tag
-   */
-  public function __toString()
-  {
-    return $this->open().$this->getFormattedLabel();
-  }
-
-  /**
-   * Opens a group
-   *
-   * @return string Opening tag
-   */
-  public function open()
-  {
-    if ($this->getErrors()) {
-      $this->state($this->app['former.framework']->errorState());
-    }
-
-    // Retrieve state and append it to classes
-    if ($this->state) {
-      $this->addClass($this->state);
-    }
-
-    // Required state
-    if ($this->app->bound('former.field') and $this->app['former.field']->isRequired()) {
-      $this->addClass($this->app['former']->getOption('required_class'));
-    }
-
-    return parent::open();
-  }
-
-  /**
-   * Set the contents of the current group
-   *
-   * @param string $contents The group contents
-   *
-   * @return string A group
-   */
-  public function contents($contents)
-  {
-    return $this->wrap($contents, $this->getFormattedLabel());
-  }
-
-  /**
-   * Wrap a Field with the current group
-   *
-   * @param  Field  $field A Field instance
-   * @return string        A group
-   */
-  public function wrapField($field)
-  {
-    $label  = $this->getLabel($field);
-    $field  = $this->prependAppend($field);
-    $field .= $this->getHelp();
-
-    return $this->wrap($field, $label);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// FIELD METHODS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Set the state of the group
-   *
-   * @param  string $state A Bootstrap state class
-   */
-  public function state($state)
-  {
-    // Filter state
-    $state = $this->app['former.framework']->filterState($state);
-
-    $this->state = $state;
-  }
-
-  /**
-   * Set a class on the Group
-   *
-   * @param string $class The class to add
-   */
-  public function addGroupClass($class)
-  {
-    $this->addClass($class);
-  }
-
-  /**
-   * Adds a label to the group
-   *
-   * @param  string $label A label
-   */
-  public function setLabel($label)
-  {
-    if (!$label instanceof Element) {
-      $label = Helpers::translate($label);
-      $label = Element::create('label', $label)->for($label);
-    }
-
-    $this->label = $label;
-  }
-
-  /**
-   * Get the formatted group label
-   *
-   * @return string
-   */
-  public function getFormattedLabel()
-  {
-    if (!$this->label) {
-      return false;
-    }
-
-    return $this->label->addClass($this->app['former.framework']->getLabelClasses());
-  }
-
-  /**
-   * Disables the control group for the current field
-   */
-  public function raw()
-  {
-    $this->raw = true;
-  }
-
-  /**
-   * Check if the current group is to be displayed or not
-   *
-   * @return boolean
-   */
-  public function isRaw()
-  {
-    return (bool) $this->raw;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// HELP BLOCKS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Alias for inlineHelp
-   *
-   * @param  string $help       The help text
-   * @param  array  $attributes Facultative attributes
-   */
-  public function help($help, $attributes = array())
-  {
-    return $this->inlineHelp($help, $attributes);
-  }
-
-  /**
-   * Add an inline help
-   *
-   * @param  string $help       The help text
-   * @param  array  $attributes Facultative attributes
-   */
-  public function inlineHelp($help, $attributes = array())
-  {
-    // If no help text, do nothing
-    if (!$help) {
-      return false;
-    }
-
-    $this->help['inline'] = $this->app['former.framework']->createHelp($help, $attributes);
-  }
-
-  /**
-   * Add an block help
-   *
-   * @param  string $help       The help text
-   * @param  array  $attributes Facultative attributes
-   */
-  public function blockHelp($help, $attributes = array())
-  {
-    // Reserved method
-    if ($this->app['former.framework']->isnt('TwitterBootstrap') && $this->app['former.framework']->isnt('TwitterBootstrap3')) {
-      throw new BadMethodCallException('This method is only available on the Bootstrap framework');
-    }
-
-    // If no help text, do nothing
-    if (!$help) {
-      return false;
-    }
-
-    $this->help['block'] = $this->app['former.framework']->createBlockHelp($help, $attributes);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////// PREPEND/APPEND METHODS ///////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Prepend elements to the field
-   */
-  public function prepend()
-  {
-    $this->placeAround(func_get_args(), 'prepend');
-  }
-
-  /**
-   * Append elements to the field
-   */
-  public function append()
-  {
-    $this->placeAround(func_get_args(), 'append');
-  }
-
-  /**
-   * Prepends an icon to a field
-   *
-   * @param string $icon       The icon to prepend
-   * @param array  $attributes Its attributes
-   */
-  public function prependIcon($icon, $attributes = array(), $iconSettings = array())
-  {
-    $icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
-
-    $this->prepend($icon);
-  }
-
-  /**
-   * Append an icon to a field
-   *
-   * @param string $icon       The icon to prepend
-   * @param array  $attributes Its attributes
-   */
-  public function appendIcon($icon, $attributes = array(), $iconSettings = array())
-  {
-    $icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
-
-    $this->append($icon);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// HELPERS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Get the errors for the group
-   *
-   * @return string
-   */
-  public function getErrors()
-  {
-    $errors = '';
-
-    if (!self::$opened) {
-
-      // for non-custom groups, normal error handling applies
-      $errors = $this->app['former']->getErrors();
-
-    } elseif (!empty($this->validations)) {
-
-      // error handling only when validations specified for custom groups
-      foreach ($this->validations as $validation) {
-        $errors .= $this->app['former']->getErrors($validation);
-      }
-    }
-
-    return $errors;
-  }
-
-  /**
-   * Wraps content in a group
-   *
-   * @param mixed  $contents The content
-   * @param string $label    The label to add
-   *
-   * @return string A group
-   */
-  public function wrap($contents, $label = null)
-  {
-    $group = $this->open();
-      $group .= $label;
-      $group .= $this->app['former.framework']->wrapField($contents);
-    $group .= $this->close();
-
-    return $group;
-  }
-
-  /**
-   * Prints out the current label
-   *
-   * @param  string $field The field to create a label for
-   * @return string        A <label> tag
-   */
-  protected function getLabel($field = null)
-  {
-    // Don't create a label if none exist
-    if (!$field or !$this->label) {
-      return null;
-    }
-
-    // Wrap label in framework classes
-    $this->label->addClass($this->app['former.framework']->getLabelClasses());
-    $this->label = $this->app['former.framework']->createLabelOf($field, $this->label);
-    $this->label = $this->app['former.framework']->wrapLabel($this->label);
-
-    return $this->label;
-  }
-
-  /**
-   * Prints out the current help
-   *
-   * @return string A .help-block or .help-inline
-   */
-  protected function getHelp()
-  {
-    $inline = array_get($this->help, 'inline');
-    $block  = array_get($this->help, 'block');
-
-    // Replace help text with error if any found
-    $errors = $this->app['former']->getErrors();
-    if ($errors and $this->app['former']->getOption('error_messages')) {
-      $inline = $this->app['former.framework']->createHelp($errors);
-    }
-
-    return join(null, array($inline, $block));
-  }
-
-  /**
-   * Format the field with prepended/appended elements
-   *
-   * @param  Field  $field The field to format
-   * @return string        Field plus supplementary elements
-   */
-  protected function prependAppend($field)
-  {
-    if (!$this->prepend and !$this->append) {
-      return $field->render();
-    }
-
-    return $this->app['former.framework']->prependAppend($field, $this->prepend, $this->append);
-  }
-
-  /**
-   * Place elements around the field
-   *
-   * @param  array  $items An array of items to place
-   * @param  string $place Where they should end up (prepend|append)
-   */
-  protected function placeAround($items, $place)
-  {
-    // Iterate over the items and place them where they should
-    foreach ((array) $items as $item) {
-      $item = $this->app['former.framework']->placeAround($item);
-      $this->{$place}[] = $item;
-    }
-  }
+	/**
+	 * The Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
+
+	/**
+	 * The current state of the group
+	 *
+	 * @var string
+	 */
+	protected $state = null;
+
+	/**
+	 * Whether the field should be displayed raw or not
+	 *
+	 * @var boolean
+	 */
+	protected $raw = false;
+
+	/**
+	 * The group label
+	 *
+	 * @var Element
+	 */
+	protected $label;
+
+	/**
+	 * The group help
+	 *
+	 * @var string
+	 */
+	protected $help = null;
+
+	/**
+	 * An array of elements to preprend the field
+	 *
+	 * @var array
+	 */
+	protected $prepend = array();
+
+	/**
+	 * An array of elements to append the field
+	 *
+	 * @var array
+	 */
+	protected $append = array();
+
+	/**
+	 * The field validations to be checked for errors
+	 *
+	 * @var array
+	 */
+	protected $validations = array();
+
+	/**
+	 * The group's element
+	 *
+	 * @var string
+	 */
+	protected $element = 'div';
+
+	/**
+	 * Whether a custom group is opened or not
+	 *
+	 * @var boolean
+	 */
+	public static $opened = false;
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CORE METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Creates a group
+	 *
+	 * @param Container $Container  The Container instance
+	 * @param string    $label      Its label
+	 * @param array     $attributes Attributes
+	 */
+	public function __construct(Container $app, $label, $validations = null)
+	{
+		// Get special classes
+		$this->app = $app;
+		$this->addClass($this->app['former.framework']->getGroupClasses());
+
+		// Invisible if Nude
+		if ($this->app['former.framework']->is('Nude')) {
+			$this->element = '';
+		}
+
+		// Set group label
+		if ($label) {
+			$this->setLabel($label);
+		}
+
+		// Set validations used to override groups own conclusions
+		$this->validations = (array) $validations;
+	}
+
+	/**
+	 * Prints out the opening of the Control Group
+	 *
+	 * @return string A control group opening tag
+	 */
+	public function __toString()
+	{
+		return $this->open().$this->getFormattedLabel();
+	}
+
+	/**
+	 * Opens a group
+	 *
+	 * @return string Opening tag
+	 */
+	public function open()
+	{
+		if ($this->getErrors()) {
+			$this->state($this->app['former.framework']->errorState());
+		}
+
+		// Retrieve state and append it to classes
+		if ($this->state) {
+			$this->addClass($this->state);
+		}
+
+		// Required state
+		if ($this->app->bound('former.field') and $this->app['former.field']->isRequired()) {
+			$this->addClass($this->app['former']->getOption('required_class'));
+		}
+
+		return parent::open();
+	}
+
+	/**
+	 * Set the contents of the current group
+	 *
+	 * @param string $contents The group contents
+	 *
+	 * @return string A group
+	 */
+	public function contents($contents)
+	{
+		return $this->wrap($contents, $this->getFormattedLabel());
+	}
+
+	/**
+	 * Wrap a Field with the current group
+	 *
+	 * @param  Field $field A Field instance
+	 *
+	 * @return string        A group
+	 */
+	public function wrapField($field)
+	{
+		$label = $this->getLabel($field);
+		$field = $this->prependAppend($field);
+		$field .= $this->getHelp();
+
+		return $this->wrap($field, $label);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// FIELD METHODS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Set the state of the group
+	 *
+	 * @param  string $state A Bootstrap state class
+	 */
+	public function state($state)
+	{
+		// Filter state
+		$state = $this->app['former.framework']->filterState($state);
+
+		$this->state = $state;
+	}
+
+	/**
+	 * Set a class on the Group
+	 *
+	 * @param string $class The class to add
+	 */
+	public function addGroupClass($class)
+	{
+		$this->addClass($class);
+	}
+
+	/**
+	 * Adds a label to the group
+	 *
+	 * @param  string $label A label
+	 */
+	public function setLabel($label)
+	{
+		if (!$label instanceof Element) {
+			$label = Helpers::translate($label);
+			$label = Element::create('label', $label)->for($label);
+		}
+
+		$this->label = $label;
+	}
+
+	/**
+	 * Get the formatted group label
+	 *
+	 * @return string
+	 */
+	public function getFormattedLabel()
+	{
+		if (!$this->label) {
+			return false;
+		}
+
+		return $this->label->addClass($this->app['former.framework']->getLabelClasses());
+	}
+
+	/**
+	 * Disables the control group for the current field
+	 */
+	public function raw()
+	{
+		$this->raw = true;
+	}
+
+	/**
+	 * Check if the current group is to be displayed or not
+	 *
+	 * @return boolean
+	 */
+	public function isRaw()
+	{
+		return (bool) $this->raw;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// HELP BLOCKS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Alias for inlineHelp
+	 *
+	 * @param  string $help       The help text
+	 * @param  array  $attributes Facultative attributes
+	 */
+	public function help($help, $attributes = array())
+	{
+		return $this->inlineHelp($help, $attributes);
+	}
+
+	/**
+	 * Add an inline help
+	 *
+	 * @param  string $help       The help text
+	 * @param  array  $attributes Facultative attributes
+	 */
+	public function inlineHelp($help, $attributes = array())
+	{
+		// If no help text, do nothing
+		if (!$help) {
+			return false;
+		}
+
+		$this->help['inline'] = $this->app['former.framework']->createHelp($help, $attributes);
+	}
+
+	/**
+	 * Add an block help
+	 *
+	 * @param  string $help       The help text
+	 * @param  array  $attributes Facultative attributes
+	 */
+	public function blockHelp($help, $attributes = array())
+	{
+		// Reserved method
+		if ($this->app['former.framework']->isnt('TwitterBootstrap') && $this->app['former.framework']->isnt('TwitterBootstrap3')) {
+			throw new BadMethodCallException('This method is only available on the Bootstrap framework');
+		}
+
+		// If no help text, do nothing
+		if (!$help) {
+			return false;
+		}
+
+		$this->help['block'] = $this->app['former.framework']->createBlockHelp($help, $attributes);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////// PREPEND/APPEND METHODS ///////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Prepend elements to the field
+	 */
+	public function prepend()
+	{
+		$this->placeAround(func_get_args(), 'prepend');
+	}
+
+	/**
+	 * Append elements to the field
+	 */
+	public function append()
+	{
+		$this->placeAround(func_get_args(), 'append');
+	}
+
+	/**
+	 * Prepends an icon to a field
+	 *
+	 * @param string $icon       The icon to prepend
+	 * @param array  $attributes Its attributes
+	 */
+	public function prependIcon($icon, $attributes = array(), $iconSettings = array())
+	{
+		$icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
+
+		$this->prepend($icon);
+	}
+
+	/**
+	 * Append an icon to a field
+	 *
+	 * @param string $icon       The icon to prepend
+	 * @param array  $attributes Its attributes
+	 */
+	public function appendIcon($icon, $attributes = array(), $iconSettings = array())
+	{
+		$icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
+
+		$this->append($icon);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// HELPERS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Get the errors for the group
+	 *
+	 * @return string
+	 */
+	public function getErrors()
+	{
+		$errors = '';
+
+		if (!self::$opened) {
+
+			// for non-custom groups, normal error handling applies
+			$errors = $this->app['former']->getErrors();
+		} elseif (!empty($this->validations)) {
+
+			// error handling only when validations specified for custom groups
+			foreach ($this->validations as $validation) {
+				$errors .= $this->app['former']->getErrors($validation);
+			}
+		}
+
+		return $errors;
+	}
+
+	/**
+	 * Wraps content in a group
+	 *
+	 * @param mixed  $contents The content
+	 * @param string $label    The label to add
+	 *
+	 * @return string A group
+	 */
+	public function wrap($contents, $label = null)
+	{
+		$group = $this->open();
+		$group .= $label;
+		$group .= $this->app['former.framework']->wrapField($contents);
+		$group .= $this->close();
+
+		return $group;
+	}
+
+	/**
+	 * Prints out the current label
+	 *
+	 * @param  string $field The field to create a label for
+	 *
+	 * @return string        A <label> tag
+	 */
+	protected function getLabel($field = null)
+	{
+		// Don't create a label if none exist
+		if (!$field or !$this->label) {
+			return null;
+		}
+
+		// Wrap label in framework classes
+		$this->label->addClass($this->app['former.framework']->getLabelClasses());
+		$this->label = $this->app['former.framework']->createLabelOf($field, $this->label);
+		$this->label = $this->app['former.framework']->wrapLabel($this->label);
+
+		return $this->label;
+	}
+
+	/**
+	 * Prints out the current help
+	 *
+	 * @return string A .help-block or .help-inline
+	 */
+	protected function getHelp()
+	{
+		$inline = array_get($this->help, 'inline');
+		$block  = array_get($this->help, 'block');
+
+		// Replace help text with error if any found
+		$errors = $this->app['former']->getErrors();
+		if ($errors and $this->app['former']->getOption('error_messages')) {
+			$inline = $this->app['former.framework']->createHelp($errors);
+		}
+
+		return join(null, array($inline, $block));
+	}
+
+	/**
+	 * Format the field with prepended/appended elements
+	 *
+	 * @param  Field $field The field to format
+	 *
+	 * @return string        Field plus supplementary elements
+	 */
+	protected function prependAppend($field)
+	{
+		if (!$this->prepend and !$this->append) {
+			return $field->render();
+		}
+
+		return $this->app['former.framework']->prependAppend($field, $this->prepend, $this->append);
+	}
+
+	/**
+	 * Place elements around the field
+	 *
+	 * @param  array  $items An array of items to place
+	 * @param  string $place Where they should end up (prepend|append)
+	 */
+	protected function placeAround($items, $place)
+	{
+		// Iterate over the items and place them where they should
+		foreach ((array) $items as $item) {
+			$item             = $this->app['former.framework']->placeAround($item);
+			$this->{$place}[] = $item;
+		}
+	}
 }
diff --git a/src/Former/Former.php b/src/Former/Former.php
index b2b54a0e..762a816b 100644
--- a/src/Former/Former.php
+++ b/src/Former/Former.php
@@ -12,436 +12,442 @@
  */
 class Former
 {
-  // Instances
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * The current environment
-   *
-   * @var Illuminate\Container
-   */
-  protected $app;
-
-  /**
-   * The Method Dispatcher
-   *
-   * @var MethodDispatcher
-   */
-  protected $dispatch;
-
-  // Informations
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * The form's errors
-   *
-   * @var Message
-   */
-  protected $errors;
-
-  /**
-   * An array of rules to use
-   *
-   * @var array
-   */
-  protected $rules = array();
-
-  /**
-   * An array of field macros
-   *
-   * @var array
-   */
-  protected $macros = array();
-
-  /**
-   * The labels created so far
-   *
-   * @var array
-   */
-  public $labels = array();
-
-  /**
-   * The IDs created so far
-   *
-   * @var array
-   */
-  public $ids = array();
-
-  // Namespaces
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * The namespace of Form elements
-   */
-  const FORMSPACE = 'Former\Form\\';
-
-  /**
-   * The namespace of fields
-   */
-  const FIELDSPACE = 'Former\Form\Fields\\';
-
-  /**
-   * Build a new Former instance
-   *
-   * @param Container         $app
-   * @param MethodDispatcher  $dispatcher
-   */
-  public function __construct(Container $app, MethodDispatcher $dispatcher)
-  {
-    $this->app      = $app;
-    $this->dispatch = $dispatcher;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// INTERFACE /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Acts as a router that redirects methods to all of Former classes
-   *
-   * @param  string $method     The method called
-   * @param  array  $parameters An array of parameters
-   *
-   * @return mixed
-   */
-  public function __call($method, $parameters)
-  {
-    // Dispatch to Form\Elements
-    if ($element = $this->dispatch->toElements($method, $parameters)) {
-      return $element;
-    }
-
-    // Dispatch to Form\Form
-    if ($form = $this->dispatch->toForm($method, $parameters)) {
-      $this->app->instance('former.form', $form);
-
-      return $this->app['former.form'];
-    }
-
-    // Dispatch to Form\Group
-    if ($group = $this->dispatch->toGroup($method, $parameters)) {
-      return $group;
-    }
-
-    // Dispatch to Form\Actions
-    if ($actions = $this->dispatch->toActions($method, $parameters)) {
-      return $actions;
-    }
-
-    // Dispatch to macros
-    if ($macro = $this->dispatch->toMacros($method, $parameters)) {
-      return $macro;
-    }
-
-    // Checking for any supplementary classes
-    $classes = explode('_', $method);
-    $method  = array_pop($classes);
-
-    // Dispatch to the different Form\Fields
-    $framework = isset($this->app['former.form.framework']) ? $this->app['former.form.framework'] : $this->app['former.framework'];
-    $field     = $this->dispatch->toFields($method, $parameters);
-
-    if ($field instanceof Field) {
-      $field = $framework->getFieldClasses($field, $classes);
-    }
-
-    // Else bind field
-    $this->app->instance('former.field', $field);
-
-    return $this->app['former.field'];
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// MACROS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Register a macro with Former
-   *
-   * @param  string   $name         The name of the macro
-   * @param  Callable $macro        The macro itself
-   *
-   * @return mixed
-   */
-  public function macro($name, $macro)
-  {
-    $this->macros[$name] = $macro;
-  }
-
-  /**
-   * Check if a macro exists
-   *
-   * @param  string  $name
-   *
-   * @return boolean
-   */
-  public function hasMacro($name)
-  {
-    return isset($this->macros[$name]);
-  }
-
-  /**
-   * Get a registered macro
-   *
-   * @param  string $name
-   *
-   * @return Closure
-   */
-  public function getMacro($name)
-  {
-    return $this->macros[$name];
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// POPULATOR ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Add values to populate the array
-   *
-   * @param mixed $values Can be an Eloquent object or an array
-   */
-  public function populate($values)
-  {
-    $this->app['former.populator']->replace($values);
-  }
-
-  /**
-   * Set the value of a particular field
-   *
-   * @param string $field The field's name
-   * @param mixed  $value Its new value
-   */
-  public function populateField($field, $value)
-  {
-    $this->app['former.populator']->put($field, $value);
-  }
-
-  /**
-   * Get the value of a field
-   *
-   * @param string $field The field's name
-   * @return mixed
-   */
-  public function getValue($field, $fallback = null)
-  {
-    return $this->app['former.populator']->get($field, $fallback);
-  }
-
-  /**
-   * Fetch a field value from both the new and old POST array
-   *
-   * @param  string $name     A field name
-   * @param  string $fallback A fallback if nothing was found
-   * @return string           The results
-   */
-  public function getPost($name, $fallback = null)
-  {
-    $name = str_replace(array('[', ']'), array('.', ''), $name);
-    $name = trim($name, '.');
-    $oldValue = $this->app['request']->old($name, $fallback);
-
-    return $this->app['request']->input($name, $oldValue, true);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// TOOLKIT /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Set the errors to use for validations
-   *
-   * @param Message $validator The result from a validation
-   *
-   * @return  void
-   */
-  public function withErrors($validator = null)
-  {
-    // Try to get the errors form the session
-    if ($this->app['session']->has('errors')) {
-      $this->errors = $this->app['session']->get('errors');
-    }
-
-    // If we're given a raw Validator, go fetch the errors in it
-    if ($validator instanceof Validator) {
-      $this->errors = $validator->getMessageBag();
-
-    } else if ($validator instanceof MessageBag) {
-      $this->errors = $validator;
-    }
-
-    return $this->errors;
-  }
-
-  /**
-   * Add live validation rules
-   *
-   * @param  array *$rules An array of Laravel rules
-   *
-   * @return  void
-   */
-  public function withRules()
-  {
-    $rules = call_user_func_array('array_merge', func_get_args());
-
-    // Parse the rules according to Laravel conventions
-    foreach ($rules as $name => $fieldRules) {
-      $expFieldRules = $fieldRules;
-      if (!is_array($expFieldRules)) {
-        $expFieldRules = explode('|', $expFieldRules);
-        $expFieldRules = array_map('trim', $expFieldRules);
-      }
-
-      foreach ($expFieldRules as $rule) {
-
-        // If we have a rule with a value
-        if (($colon = strpos($rule, ':')) !== false) {
-          $parameters = str_getcsv(substr($rule, $colon + 1));
-        }
-
-       // Exclude unsupported rules
-       $rule = is_numeric($colon) ? substr($rule, 0, $colon) : $rule;
-
-       // Store processed rule in Former's array
-       if (!isset($parameters)) {
-        $parameters = array();
-       }
-
-       $this->rules[$name][$rule] = $parameters;
-      }
-    }
-  }
-
-  /**
-   * Switch the framework used by Former
-   *
-   * @param string $framework The name of the framework to use
-   */
-  public function framework($framework = null)
-  {
-    if (!$framework) {
-      return $this->app['former.framework']->current();
-    }
-
-    $this->setOption('framework', $framework);
-
-    $framework = $this->getFrameworkInstance($framework);
-    $this->app->bind('former.framework', function ($app) use ($framework) {
-      return $framework;
-    });
-  }
-
-  /**
-   * Get a new framework instance
-   *
-   * @param string $framework
-   *
-   * @return Framework
-   */
-  public function getFrameworkInstance($framework)
-  {
-    // Get the fully qualified name
-    $class = __NAMESPACE__.'\Framework\\'.$framework;
-
-    return new $class($this->app);
-  }
-
-  /**
-   * Get an option from the config
-   *
-   * @param string $option  The option
-   * @param mixed  $default Optional fallback
-   *
-   * @return mixed
-   */
-  public function getOption($option, $default = null)
-  {
-    return $this->app['config']->get('former::'.$option, $default);
-  }
-
-  /**
-   * Set an option on the config
-   *
-   * @param string $option
-   * @param mixed  $value
-   */
-  public function setOption($option, $value)
-  {
-    return $this->app['config']->set('former::'.$option, $value);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// BUILDERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Closes a form
-   *
-   * @return string A form closing tag
-   */
-  public function close()
-  {
-    if ($this->app->bound('former.form')) {
-      $closing = $this->app['former.form']->close();
-    }
-
-    // Destroy instances
-    $instances = array('former.form', 'former.form.framework');
-    foreach ($instances as $instance) {
-      $this->app[$instance] = null;
-      unset($this->app[$instance]);
-    }
-
-    // Reset populator
-    $this->app['former.populator']->reset();
-
-    // Reset all values
-    $this->errors = null;
-    $this->rules  = null;
-
-    return isset($closing) ? $closing : null;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// HELPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Get the errors for the current field
-   *
-   * @param  string $name A field name
-   * @return string       An error message
-   */
-  public function getErrors($name = null)
-  {
-    // Get name and translate array notation
-    if (!$name and $this->app['former.field']) {
-      $name = $this->app['former.field']->getName();
-
-      // Always return empty string for anonymous fields (i.e. fields with no name/id)
-      if (!$name) {
-        return '';
-      }
-    }
-
-    if ($this->errors and $name) {
-      $name = str_replace(array('[', ']'), array('.', ''), $name);
-      $name = trim($name, '.');
-
-      return $this->errors->first($name);
-    }
-
-    return $this->errors;
-  }
-
-  /**
-   * Get a rule from the Rules array
-   *
-   * @param  string $name The field to fetch
-   * @return array        An array of rules
-   */
-  public function getRules($name)
-  {
-    return array_get($this->rules, $name);
-  }
+	// Instances
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * The current environment
+	 *
+	 * @var \Illuminate\Container\Container
+	 */
+	protected $app;
+
+	/**
+	 * The Method Dispatcher
+	 *
+	 * @var MethodDispatcher
+	 */
+	protected $dispatch;
+
+	// Informations
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * The form's errors
+	 *
+	 * @var Message
+	 */
+	protected $errors;
+
+	/**
+	 * An array of rules to use
+	 *
+	 * @var array
+	 */
+	protected $rules = array();
+
+	/**
+	 * An array of field macros
+	 *
+	 * @var array
+	 */
+	protected $macros = array();
+
+	/**
+	 * The labels created so far
+	 *
+	 * @var array
+	 */
+	public $labels = array();
+
+	/**
+	 * The IDs created so far
+	 *
+	 * @var array
+	 */
+	public $ids = array();
+
+	// Namespaces
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * The namespace of Form elements
+	 */
+	const FORMSPACE = 'Former\Form\\';
+
+	/**
+	 * The namespace of fields
+	 */
+	const FIELDSPACE = 'Former\Form\Fields\\';
+
+	/**
+	 * Build a new Former instance
+	 *
+	 * @param Container        $app
+	 * @param MethodDispatcher $dispatcher
+	 */
+	public function __construct(Container $app, MethodDispatcher $dispatcher)
+	{
+		$this->app      = $app;
+		$this->dispatch = $dispatcher;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// INTERFACE /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Acts as a router that redirects methods to all of Former classes
+	 *
+	 * @param  string $method     The method called
+	 * @param  array  $parameters An array of parameters
+	 *
+	 * @return mixed
+	 */
+	public function __call($method, $parameters)
+	{
+		// Dispatch to Form\Elements
+		if ($element = $this->dispatch->toElements($method, $parameters)) {
+			return $element;
+		}
+
+		// Dispatch to Form\Form
+		if ($form = $this->dispatch->toForm($method, $parameters)) {
+			$this->app->instance('former.form', $form);
+
+			return $this->app['former.form'];
+		}
+
+		// Dispatch to Form\Group
+		if ($group = $this->dispatch->toGroup($method, $parameters)) {
+			return $group;
+		}
+
+		// Dispatch to Form\Actions
+		if ($actions = $this->dispatch->toActions($method, $parameters)) {
+			return $actions;
+		}
+
+		// Dispatch to macros
+		if ($macro = $this->dispatch->toMacros($method, $parameters)) {
+			return $macro;
+		}
+
+		// Checking for any supplementary classes
+		$classes = explode('_', $method);
+		$method  = array_pop($classes);
+
+		// Dispatch to the different Form\Fields
+		$framework = isset($this->app['former.form.framework']) ? $this->app['former.form.framework'] : $this->app['former.framework'];
+		$field     = $this->dispatch->toFields($method, $parameters);
+
+		if ($field instanceof Field) {
+			$field = $framework->getFieldClasses($field, $classes);
+		}
+
+		// Else bind field
+		$this->app->instance('former.field', $field);
+
+		return $this->app['former.field'];
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// MACROS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Register a macro with Former
+	 *
+	 * @param  string   $name  The name of the macro
+	 * @param  Callable $macro The macro itself
+	 *
+	 * @return mixed
+	 */
+	public function macro($name, $macro)
+	{
+		$this->macros[$name] = $macro;
+	}
+
+	/**
+	 * Check if a macro exists
+	 *
+	 * @param  string $name
+	 *
+	 * @return boolean
+	 */
+	public function hasMacro($name)
+	{
+		return isset($this->macros[$name]);
+	}
+
+	/**
+	 * Get a registered macro
+	 *
+	 * @param  string $name
+	 *
+	 * @return Closure
+	 */
+	public function getMacro($name)
+	{
+		return $this->macros[$name];
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// POPULATOR ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Add values to populate the array
+	 *
+	 * @param mixed $values Can be an Eloquent object or an array
+	 */
+	public function populate($values)
+	{
+		$this->app['former.populator']->replace($values);
+	}
+
+	/**
+	 * Set the value of a particular field
+	 *
+	 * @param string $field The field's name
+	 * @param mixed  $value Its new value
+	 */
+	public function populateField($field, $value)
+	{
+		$this->app['former.populator']->put($field, $value);
+	}
+
+	/**
+	 * Get the value of a field
+	 *
+	 * @param string $field The field's name
+	 * @param null   $fallback
+	 *
+	 * @return mixed
+	 */
+	public function getValue($field, $fallback = null)
+	{
+		return $this->app['former.populator']->get($field, $fallback);
+	}
+
+	/**
+	 * Fetch a field value from both the new and old POST array
+	 *
+	 * @param  string $name     A field name
+	 * @param  string $fallback A fallback if nothing was found
+	 *
+	 * @return string           The results
+	 */
+	public function getPost($name, $fallback = null)
+	{
+		$name     = str_replace(array('[', ']'), array('.', ''), $name);
+		$name     = trim($name, '.');
+		$oldValue = $this->app['request']->old($name, $fallback);
+
+		return $this->app['request']->input($name, $oldValue, true);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// TOOLKIT /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Set the errors to use for validations
+	 *
+	 * @param Message $validator The result from a validation
+	 *
+	 * @return  void
+	 */
+	public function withErrors($validator = null)
+	{
+		// Try to get the errors form the session
+		if ($this->app['session']->has('errors')) {
+			$this->errors = $this->app['session']->get('errors');
+		}
+
+		// If we're given a raw Validator, go fetch the errors in it
+		if ($validator instanceof Validator) {
+			$this->errors = $validator->getMessageBag();
+		} else {
+			if ($validator instanceof MessageBag) {
+				$this->errors = $validator;
+			}
+		}
+
+		return $this->errors;
+	}
+
+	/**
+	 * Add live validation rules
+	 *
+	 * @param  array *$rules An array of Laravel rules
+	 *
+	 * @return  void
+	 */
+	public function withRules()
+	{
+		$rules = call_user_func_array('array_merge', func_get_args());
+
+		// Parse the rules according to Laravel conventions
+		foreach ($rules as $name => $fieldRules) {
+			$expFieldRules = $fieldRules;
+			if (!is_array($expFieldRules)) {
+				$expFieldRules = explode('|', $expFieldRules);
+				$expFieldRules = array_map('trim', $expFieldRules);
+			}
+
+			foreach ($expFieldRules as $rule) {
+
+				// If we have a rule with a value
+				if (($colon = strpos($rule, ':')) !== false) {
+					$parameters = str_getcsv(substr($rule, $colon + 1));
+				}
+
+				// Exclude unsupported rules
+				$rule = is_numeric($colon) ? substr($rule, 0, $colon) : $rule;
+
+				// Store processed rule in Former's array
+				if (!isset($parameters)) {
+					$parameters = array();
+				}
+
+				$this->rules[$name][$rule] = $parameters;
+			}
+		}
+	}
+
+	/**
+	 * Switch the framework used by Former
+	 *
+	 * @param string $framework The name of the framework to use
+	 */
+	public function framework($framework = null)
+	{
+		if (!$framework) {
+			return $this->app['former.framework']->current();
+		}
+
+		$this->setOption('framework', $framework);
+
+		$framework = $this->getFrameworkInstance($framework);
+		$this->app->bind('former.framework', function ($app) use ($framework) {
+			return $framework;
+		});
+	}
+
+	/**
+	 * Get a new framework instance
+	 *
+	 * @param string $framework
+	 *
+	 * @return Framework
+	 */
+	public function getFrameworkInstance($framework)
+	{
+		// Get the fully qualified name
+		$class = __NAMESPACE__.'\Framework\\'.$framework;
+
+		return new $class($this->app);
+	}
+
+	/**
+	 * Get an option from the config
+	 *
+	 * @param string $option  The option
+	 * @param mixed  $default Optional fallback
+	 *
+	 * @return mixed
+	 */
+	public function getOption($option, $default = null)
+	{
+		return $this->app['config']->get('former::'.$option, $default);
+	}
+
+	/**
+	 * Set an option on the config
+	 *
+	 * @param string $option
+	 * @param mixed  $value
+	 */
+	public function setOption($option, $value)
+	{
+		return $this->app['config']->set('former::'.$option, $value);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// BUILDERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Closes a form
+	 *
+	 * @return string A form closing tag
+	 */
+	public function close()
+	{
+		if ($this->app->bound('former.form')) {
+			$closing = $this->app['former.form']->close();
+		}
+
+		// Destroy instances
+		$instances = array('former.form', 'former.form.framework');
+		foreach ($instances as $instance) {
+			$this->app[$instance] = null;
+			unset($this->app[$instance]);
+		}
+
+		// Reset populator
+		$this->app['former.populator']->reset();
+
+		// Reset all values
+		$this->errors = null;
+		$this->rules  = null;
+
+		return isset($closing) ? $closing : null;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// HELPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Get the errors for the current field
+	 *
+	 * @param  string $name A field name
+	 *
+	 * @return string       An error message
+	 */
+	public function getErrors($name = null)
+	{
+		// Get name and translate array notation
+		if (!$name and $this->app['former.field']) {
+			$name = $this->app['former.field']->getName();
+
+			// Always return empty string for anonymous fields (i.e. fields with no name/id)
+			if (!$name) {
+				return '';
+			}
+		}
+
+		if ($this->errors and $name) {
+			$name = str_replace(array('[', ']'), array('.', ''), $name);
+			$name = trim($name, '.');
+
+			return $this->errors->first($name);
+		}
+
+		return $this->errors;
+	}
+
+	/**
+	 * Get a rule from the Rules array
+	 *
+	 * @param  string $name The field to fetch
+	 *
+	 * @return array        An array of rules
+	 */
+	public function getRules($name)
+	{
+		return array_get($this->rules, $name);
+	}
 }
diff --git a/src/Former/FormerServiceProvider.php b/src/Former/FormerServiceProvider.php
index bf5e67e5..8663c1d0 100644
--- a/src/Former/FormerServiceProvider.php
+++ b/src/Former/FormerServiceProvider.php
@@ -1,8 +1,6 @@
 <?php
 namespace Former;
 
-use Former\Former;
-use Former\Populator;
 use Illuminate\Config\FileLoader as ConfigLoader;
 use Illuminate\Config\Repository;
 use Illuminate\Container\Container;
@@ -17,159 +15,159 @@
  */
 class FormerServiceProvider extends ServiceProvider
 {
-  /**
-   * Indicates if loading of the provider is deferred.
-   *
-   * @var bool
-   */
-  protected $defer = true;
-
-  /**
-   * Register Former's package with Laravel
-   *
-   * @return void
-   */
-  public function register()
-  {
-    $this->app = static::make($this->app);
-  }
-
-  /**
-   * Get the services provided by the provider.
-   *
-   * @return array
-   */
-  public function provides()
-  {
-    return array('former');
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// CLASS BINDINGS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Create a Former container
-   *
-   * @param  Container $app
-   *
-   * @return Container
-   */
-  public static function make($app = null)
-  {
-    if (!$app) {
-      $app = new Container;
-    }
-
-    // Bind classes to container
-    $provider = new static($app);
-    $app      = $provider->bindCoreClasses($app);
-    $app      = $provider->bindFormer($app);
-
-    return $app;
-  }
-
-  /**
-   * Bind the core classes to the Container
-   *
-   * @param  Container $app
-   *
-   * @return Container
-   */
-  public function bindCoreClasses(Container $app)
-  {
-    // Cancel if in the scope of a Laravel application
-    if ($app->bound('events')) {
-      return $app;
-    }
-
-    // Core classes
-    //////////////////////////////////////////////////////////////////
-
-    $app->bindIf('files', 'Illuminate\Filesystem\Filesystem');
-    $app->bindIf('url',   'Illuminate\Routing\UrlGenerator');
-
-    // Session and request
-    //////////////////////////////////////////////////////////////////
-
-    $app->bindIf('session.manager', function ($app) {
-      return new SessionManager($app);
-    });
-
-    $app->bindIf('session', function ($app) {
-      return $app['session.manager']->driver('array');
-    }, true);
-
-    $app->bindIf('request', function ($app) {
-      $request = Request::createFromGlobals();
-      if (method_exists($request, 'setSessionStore')) {
-        $request->setSessionStore($app['session']);
-      } else {
-        $request->setSession($app['session']);
-      }
-
-      return $request;
-    }, true);
-
-    // Config
-    //////////////////////////////////////////////////////////////////
-
-    $app->bindIf('config', function ($app) {
-      $fileloader = new ConfigLoader($app['files'], __DIR__.'/../config');
-
-      return new Repository($fileloader, 'config');
-    }, true);
-
-    // Localization
-    //////////////////////////////////////////////////////////////////
-
-    $app->bindIf('translation.loader', function ($app) {
-      return new FileLoader($app['files'], 'src/config');
-    });
-
-    $app->bindIf('translator', function ($app) {
-      $loader = new FileLoader($app['files'], 'lang');
-
-      return new Translator($loader, 'fr');
-    });
-
-    return $app;
-  }
-
-  /**
-   * Bind Former classes to the container
-   *
-   * @param  Container $app
-   *
-   * @return Container
-   */
-  public function bindFormer(Container $app)
-  {
-    // Add config namespace
-    $app['config']->package('anahkiasen/former', __DIR__.'/../config');
-
-    // Get framework to use
-    $framework = $app['config']->get('former::framework');
-
-    $frameworkClass = '\Former\Framework\\'.$framework;
-    $app->bind('former.framework', function ($app) use ($frameworkClass) {
-      return new $frameworkClass($app);
-    });
-
-    $app->singleton('former.populator', function ($app) {
-      return new Populator;
-    });
-
-    $app->singleton('former.dispatcher', function($app) {
-      return new MethodDispatcher($app, Former::FIELDSPACE);
-    });
-
-    $app->singleton('former', function ($app) {
-      return new Former($app, $app->make('former.dispatcher'));
-    });
-
-    Helpers::setApp($app);
-
-    return $app;
-  }
+	/**
+	 * Indicates if loading of the provider is deferred.
+	 *
+	 * @var bool
+	 */
+	protected $defer = true;
+
+	/**
+	 * Register Former's package with Laravel
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		$this->app = static::make($this->app);
+	}
+
+	/**
+	 * Get the services provided by the provider.
+	 *
+	 * @return array
+	 */
+	public function provides()
+	{
+		return array('former');
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// CLASS BINDINGS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Create a Former container
+	 *
+	 * @param  Container $app
+	 *
+	 * @return Container
+	 */
+	public static function make($app = null)
+	{
+		if (!$app) {
+			$app = new Container();
+		}
+
+		// Bind classes to container
+		$provider = new static($app);
+		$app      = $provider->bindCoreClasses($app);
+		$app      = $provider->bindFormer($app);
+
+		return $app;
+	}
+
+	/**
+	 * Bind the core classes to the Container
+	 *
+	 * @param  Container $app
+	 *
+	 * @return Container
+	 */
+	public function bindCoreClasses(Container $app)
+	{
+		// Cancel if in the scope of a Laravel application
+		if ($app->bound('events')) {
+			return $app;
+		}
+
+		// Core classes
+		//////////////////////////////////////////////////////////////////
+
+		$app->bindIf('files', 'Illuminate\Filesystem\Filesystem');
+		$app->bindIf('url', 'Illuminate\Routing\UrlGenerator');
+
+		// Session and request
+		//////////////////////////////////////////////////////////////////
+
+		$app->bindIf('session.manager', function ($app) {
+			return new SessionManager($app);
+		});
+
+		$app->bindIf('session', function ($app) {
+			return $app['session.manager']->driver('array');
+		}, true);
+
+		$app->bindIf('request', function ($app) {
+			$request = Request::createFromGlobals();
+			if (method_exists($request, 'setSessionStore')) {
+				$request->setSessionStore($app['session']);
+			} else {
+				$request->setSession($app['session']);
+			}
+
+			return $request;
+		}, true);
+
+		// Config
+		//////////////////////////////////////////////////////////////////
+
+		$app->bindIf('config', function ($app) {
+			$fileloader = new ConfigLoader($app['files'], __DIR__.'/../config');
+
+			return new Repository($fileloader, 'config');
+		}, true);
+
+		// Localization
+		//////////////////////////////////////////////////////////////////
+
+		$app->bindIf('translation.loader', function ($app) {
+			return new FileLoader($app['files'], 'src/config');
+		});
+
+		$app->bindIf('translator', function ($app) {
+			$loader = new FileLoader($app['files'], 'lang');
+
+			return new Translator($loader, 'fr');
+		});
+
+		return $app;
+	}
+
+	/**
+	 * Bind Former classes to the container
+	 *
+	 * @param  Container $app
+	 *
+	 * @return Container
+	 */
+	public function bindFormer(Container $app)
+	{
+		// Add config namespace
+		$app['config']->package('anahkiasen/former', __DIR__.'/../config');
+
+		// Get framework to use
+		$framework = $app['config']->get('former::framework');
+
+		$frameworkClass = '\Former\Framework\\'.$framework;
+		$app->bind('former.framework', function ($app) use ($frameworkClass) {
+			return new $frameworkClass($app);
+		});
+
+		$app->singleton('former.populator', function ($app) {
+			return new Populator();
+		});
+
+		$app->singleton('former.dispatcher', function ($app) {
+			return new MethodDispatcher($app, Former::FIELDSPACE);
+		});
+
+		$app->singleton('former', function ($app) {
+			return new Former($app, $app->make('former.dispatcher'));
+		});
+
+		Helpers::setApp($app);
+
+		return $app;
+	}
 }
diff --git a/src/Former/Framework/Nude.php b/src/Former/Framework/Nude.php
index f94d8314..2ff2fd2a 100644
--- a/src/Former/Framework/Nude.php
+++ b/src/Former/Framework/Nude.php
@@ -14,163 +14,164 @@
 class Nude extends Framework implements FrameworkInterface
 {
 
-  /**
-   * The field states available
-   * @var array
-   */
-  protected $states = array(
-    'error',
-  );
-
-  /**
-   * Create a new Nude instance
-   *
-   * @param Container $app
-   */
-  public function __construct(Container $app)
-  {
-    $this->app = $app;
-    $this->setFrameworkDefaults();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// FILTER ARRAYS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function filterButtonClasses($classes)
-  {
-    return $classes;
-  }
-
-  public function filterFieldClasses($classes)
-  {
-    return $classes;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// ADD CLASSES //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function getFieldClasses(Field $field, $classes = array())
-  {
-    $classes = $this->filterFieldClasses($classes);
-
-    // If we found any class, add them
-    if ($classes) {
-      $field->class(implode(' ', $classes));
-    }
-
-    return $field;
-  }
-
-  public function getGroupClasses()
-  {
-    return null;
-  }
-
-  public function getLabelClasses()
-  {
-    return null;
-  }
-
-  public function getUneditableClasses()
-  {
-    return null;
-  }
-
-  public function getFormClasses($type)
-  {
-    return null;
-  }
-
-  public function getActionClasses()
-  {
-    return null;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// RENDER BLOCKS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Create an help text
-   */
-  public function createHelp($text, $attributes = array())
-  {
-    return Element::create('span', $text, $attributes)->addClass('help');
-  }
-
-  /**
-   * Render a disabled field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function createDisabledField(Field $field)
-  {
-    $field->disabled();
-
-    return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// WRAP BLOCKS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Wrap an item to be prepended or appended to the current field
-   *
-   * @param  string $item
-   *
-   * @return string A wrapped item
-   */
-  public function placeAround($item)
-  {
-    return Element::create('span', $item);
-  }
-
-  /**
-   * Wrap a field with prepended and appended items
-   *
-   * @param  Field $field
-   * @param  array $prepend
-   * @param  array $append
-   *
-   * @return string A field concatented with prepended and/or appended items
-   */
-  public function prependAppend($field, $prepend, $append)
-  {
-    $return = '<div>';
-      $return .= join(null, $prepend);
-      $return .= $field->render();
-      $return .= join(null, $append);
-    $return .= '</div>';
-
-    return $return;
-  }
-
-  /**
-   * Wraps all field contents with potential additional tags.
-   *
-   * @param  Field $field
-   *
-   * @return string A wrapped field
-   */
-  public function wrapField($field)
-  {
-    return $field;
-  }
-
-  /**
-   * Wrap actions block with potential additional tags
-   *
-   * @param  Actions $action
-   * @return string A wrapped actions block
-   */
-  public function wrapActions($actions)
-  {
-      return $actions;
-  }
-
+	/**
+	 * The field states available
+	 *
+	 * @var array
+	 */
+	protected $states = array(
+		'error',
+	);
+
+	/**
+	 * Create a new Nude instance
+	 *
+	 * @param Container $app
+	 */
+	public function __construct(Container $app)
+	{
+		$this->app = $app;
+		$this->setFrameworkDefaults();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// FILTER ARRAYS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function filterButtonClasses($classes)
+	{
+		return $classes;
+	}
+
+	public function filterFieldClasses($classes)
+	{
+		return $classes;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// ADD CLASSES //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function getFieldClasses(Field $field, $classes = array())
+	{
+		$classes = $this->filterFieldClasses($classes);
+
+		// If we found any class, add them
+		if ($classes) {
+			$field->class(implode(' ', $classes));
+		}
+
+		return $field;
+	}
+
+	public function getGroupClasses()
+	{
+		return null;
+	}
+
+	public function getLabelClasses()
+	{
+		return null;
+	}
+
+	public function getUneditableClasses()
+	{
+		return null;
+	}
+
+	public function getFormClasses($type)
+	{
+		return null;
+	}
+
+	public function getActionClasses()
+	{
+		return null;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// RENDER BLOCKS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Create an help text
+	 */
+	public function createHelp($text, $attributes = array())
+	{
+		return Element::create('span', $text, $attributes)->addClass('help');
+	}
+
+	/**
+	 * Render a disabled field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function createDisabledField(Field $field)
+	{
+		$field->disabled();
+
+		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// WRAP BLOCKS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Wrap an item to be prepended or appended to the current field
+	 *
+	 * @param  string $item
+	 *
+	 * @return string A wrapped item
+	 */
+	public function placeAround($item)
+	{
+		return Element::create('span', $item);
+	}
+
+	/**
+	 * Wrap a field with prepended and appended items
+	 *
+	 * @param  Field $field
+	 * @param  array $prepend
+	 * @param  array $append
+	 *
+	 * @return string A field concatented with prepended and/or appended items
+	 */
+	public function prependAppend($field, $prepend, $append)
+	{
+		$return = '<div>';
+		$return .= join(null, $prepend);
+		$return .= $field->render();
+		$return .= join(null, $append);
+		$return .= '</div>';
+
+		return $return;
+	}
+
+	/**
+	 * Wraps all field contents with potential additional tags.
+	 *
+	 * @param  Field $field
+	 *
+	 * @return string A wrapped field
+	 */
+	public function wrapField($field)
+	{
+		return $field;
+	}
+
+	/**
+	 * Wrap actions block with potential additional tags
+	 *
+	 * @param  Actions $action
+	 *
+	 * @return string A wrapped actions block
+	 */
+	public function wrapActions($actions)
+	{
+		return $actions;
+	}
 }
diff --git a/src/Former/Framework/TwitterBootstrap.php b/src/Former/Framework/TwitterBootstrap.php
index f775d0d3..740900a9 100644
--- a/src/Former/Framework/TwitterBootstrap.php
+++ b/src/Former/Framework/TwitterBootstrap.php
@@ -13,332 +13,365 @@
  */
 class TwitterBootstrap extends Framework implements FrameworkInterface
 {
-  /**
-   * Form types that trigger special styling for this Framework
-   *
-   * @var array
-   */
-  protected $availableTypes = array('horizontal', 'vertical', 'inline', 'search');
-
-  /**
-   * The button types available
-   *
-   * @var array
-   */
-  private $buttons = array(
-    'large', 'small', 'mini', 'block',
-    'danger', 'info', 'inverse', 'link', 'primary', 'success', 'warning'
-  );
-
-  /**
-   * The field sizes available
-   *
-   * @var array
-   */
-  private $fields = array(
-    'mini', 'small', 'medium', 'large', 'xlarge', 'xxlarge',
-    'span1', 'span2', 'span3', 'span4', 'span5', 'span6', 'span7',
-    'span8', 'span9', 'span10', 'span11', 'span12'
-  );
-
-  /**
-   * The field states available
-   *
-   * @var array
-   */
-  protected $states = array(
-    'success', 'warning', 'error', 'info',
-  );
-
-  /**
-   * Create a new TwitterBootstrap instance
-   *
-   * @param \Illuminate\Container\Container $app
-   */
-  public function __construct(Container $app)
-  {
-    $this->app = $app;
-    $this->setFrameworkDefaults();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// FILTER ARRAYS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Filter buttons classes
-   *
-   * @param  array $classes An array of classes
-   *
-   * @return array A filtered array
-   */
-  public function filterButtonClasses($classes)
-  {
-    // Filter classes
-    // $classes = array_intersect($classes, $this->buttons);
-
-    // Prepend button type
-    $classes = $this->prependWith($classes, 'btn-');
-    $classes[] = 'btn';
-
-    return $classes;
-  }
-
-  /**
-   * Filter field classes
-   *
-   * @param  array $classes An array of classes
-   *
-   * @return array A filtered array
-   */
-  public function filterFieldClasses($classes)
-  {
-    // Filter classes
-    $classes = array_intersect($classes, $this->fields);
-
-    // Prepend field type
-    $classes = array_map(function ($class) {
-      return Str::startsWith($class, 'span') ? $class : 'input-'.$class;
-    }, $classes);
-
-    return $classes;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// ADD CLASSES //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Add classes to a field
-   *
-   * @param Field $field
-   * @param array $classes The possible classes to add
-   *
-   * @return Field
-   */
-  public function getFieldClasses(Field $field, $classes)
-  {
-    // Add inline class for checkables
-    if ($field->isCheckable() and in_array('inline', $classes)) {
-      $field->inline();
-    }
-
-    // Filter classes according to field type
-    if ($field->isButton()) {
-      $classes = $this->filterButtonClasses($classes);
-    } else {
-      $classes = $this->filterFieldClasses($classes);
-    }
-
-    return $this->addClassesToField($field, $classes);
-  }
-
-  /**
-   * Add group classes
-   *
-   * @return string A list of group classes
-   */
-  public function getGroupClasses()
-  {
-    return 'control-group';
-  }
-
-  /**
-   * Add label classes
-   *
-   * @param  array $attributes An array of attributes
-   *
-   * @return array An array of attributes with the label class
-   */
-  public function getLabelClasses()
-  {
-    return 'control-label';
-  }
-
-  /**
-   * Add uneditable field classes
-   *
-   * @param  array $attributes The attributes
-   *
-   * @return array An array of attributes with the uneditable class
-   */
-  public function getUneditableClasses()
-  {
-    return 'uneditable-input';
-  }
-
-  /**
-   * Add form class
-   *
-   * @param  array  $attributes The attributes
-   * @param  string $type       The type of form to add
-   *
-   * @return array
-   */
-  public function getFormClasses($type)
-  {
-    return $type ? 'form-'.$type : null;
-  }
-
-  /**
-   * Add actions block class
-   *
-   * @param  array  $attributes The attributes
-   *
-   * @return array
-   */
-  public function getActionClasses()
-  {
-    return 'form-actions';
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// RENDER BLOCKS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Render an help text
-   *
-   * @param string $text
-   * @param array  $attributes
-   *
-   * @return string
-   */
-  public function createHelp($text, $attributes = array())
-  {
-    return Element::create('span', $text, $attributes)->addClass('help-inline');
-  }
-
-  /**
-   * Render a block help text
-   *
-   * @param string $text
-   * @param array  $attributes
-   *
-   * @return string
-   */
-  public function createBlockHelp($text, $attributes = array())
-  {
-    return Element::create('p', $text, $attributes)->addClass('help-block');
-  }
-
-  /**
-   * Render a disabled field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function createDisabledField(Field $field)
-  {
-    return Element::create('span', $field->getValue(), $field->getAttributes());
-  }
-
-  /**
-   * Render an icon
-   *
-   * @param string $icon          The icon name
-   * @param array  $attributes    Its general attributes
-   * @param array  $iconSettings  Icon-specific settings
-   *
-   * @return string
-   */
-  public function createIcon($iconType, $attributes = array(), $iconSettings = array())
-  {
-    // Check for empty icons
-    if (!$iconType) return false;
-
-    // Create tag
-    $tag  = array_get($iconSettings, 'tag', $this->iconTag);
-    $icon = Element::create($tag, null, $attributes);
-
-    // White icons ignore user overrides to use legacy Bootstrap styling
-    if (Str::contains($iconType, 'white')) {
-      $iconType = str_replace('white', '', $iconType);
-      $iconType = trim($iconType, '-');
-      $icon->addClass('icon-white');
-      $set    = null;
-      $prefix = 'icon';
-    } else {
-      $set    = array_get($iconSettings, 'set', $this->iconSet);
-      $prefix = array_get($iconSettings, 'prefix', $this->iconPrefix);
-    }
-    $icon->addClass("$set $prefix-$iconType");
-
-    return $icon;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// WRAP BLOCKS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Wrap an item to be prepended or appended to the current field
-   *
-   * @param  string $item
-   *
-   * @return string A wrapped item
-   */
-  public function placeAround($item)
-  {
-    // Render object
-    if (is_object($item) and method_exists($item, '__toString')) {
-      $item = $item->__toString();
-    }
-
-    // Return unwrapped if button
-    if (strpos($item, '<button') !== false) {
-      return $item;
-    }
-
-    return Element::create('span', $item)->addClass('add-on');
-  }
-
-  /**
-   * Wrap a field with prepended and appended items
-   *
-   * @param  Field $field
-   * @param  array $prepend
-   * @param  array $append
-   *
-   * @return string A field concatented with prepended and/or appended items
-   */
-  public function prependAppend($field, $prepend, $append)
-  {
-    $class = array();
-    if ($prepend) $class[] = 'input-prepend';
-    if ($append)  $class[] = 'input-append';
-
-    $return = '<div class="'.join(' ', $class).'">';
-      $return .= join(null, $prepend);
-      $return .= $field->render();
-      $return .= join(null, $append);
-    $return .= '</div>';
-
-    return $return;
-  }
-
-  /**
-   * Wrap a field with potential additional tags
-   *
-   * @param  Field $field
-   *
-   * @return string A wrapped field
-   */
-  public function wrapField($field)
-  {
-    return Element::create('div', $field)->addClass('controls');
-  }
-
-  /**
-   * Wrap actions block with potential additional tags
-   *
-   * @param  Actions $action
-   * @return string A wrapped actions block
-   */
-  public function wrapActions($actions)
-  {
-      return $actions;
-  }
-
+	/**
+	 * Form types that trigger special styling for this Framework
+	 *
+	 * @var array
+	 */
+	protected $availableTypes = array('horizontal', 'vertical', 'inline', 'search');
+
+	/**
+	 * The button types available
+	 *
+	 * @var array
+	 */
+	private $buttons = array(
+		'large',
+		'small',
+		'mini',
+		'block',
+		'danger',
+		'info',
+		'inverse',
+		'link',
+		'primary',
+		'success',
+		'warning'
+	);
+
+	/**
+	 * The field sizes available
+	 *
+	 * @var array
+	 */
+	private $fields = array(
+		'mini',
+		'small',
+		'medium',
+		'large',
+		'xlarge',
+		'xxlarge',
+		'span1',
+		'span2',
+		'span3',
+		'span4',
+		'span5',
+		'span6',
+		'span7',
+		'span8',
+		'span9',
+		'span10',
+		'span11',
+		'span12'
+	);
+
+	/**
+	 * The field states available
+	 *
+	 * @var array
+	 */
+	protected $states = array(
+		'success',
+		'warning',
+		'error',
+		'info',
+	);
+
+	/**
+	 * Create a new TwitterBootstrap instance
+	 *
+	 * @param \Illuminate\Container\Container $app
+	 */
+	public function __construct(Container $app)
+	{
+		$this->app = $app;
+		$this->setFrameworkDefaults();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// FILTER ARRAYS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Filter buttons classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return array A filtered array
+	 */
+	public function filterButtonClasses($classes)
+	{
+		// Filter classes
+		// $classes = array_intersect($classes, $this->buttons);
+
+		// Prepend button type
+		$classes   = $this->prependWith($classes, 'btn-');
+		$classes[] = 'btn';
+
+		return $classes;
+	}
+
+	/**
+	 * Filter field classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return array A filtered array
+	 */
+	public function filterFieldClasses($classes)
+	{
+		// Filter classes
+		$classes = array_intersect($classes, $this->fields);
+
+		// Prepend field type
+		$classes = array_map(function ($class) {
+			return Str::startsWith($class, 'span') ? $class : 'input-'.$class;
+		}, $classes);
+
+		return $classes;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// ADD CLASSES //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Add classes to a field
+	 *
+	 * @param Field $field
+	 * @param array $classes The possible classes to add
+	 *
+	 * @return Field
+	 */
+	public function getFieldClasses(Field $field, $classes)
+	{
+		// Add inline class for checkables
+		if ($field->isCheckable() and in_array('inline', $classes)) {
+			$field->inline();
+		}
+
+		// Filter classes according to field type
+		if ($field->isButton()) {
+			$classes = $this->filterButtonClasses($classes);
+		} else {
+			$classes = $this->filterFieldClasses($classes);
+		}
+
+		return $this->addClassesToField($field, $classes);
+	}
+
+	/**
+	 * Add group classes
+	 *
+	 * @return string A list of group classes
+	 */
+	public function getGroupClasses()
+	{
+		return 'control-group';
+	}
+
+	/**
+	 * Add label classes
+	 *
+	 * @param  array $attributes An array of attributes
+	 *
+	 * @return array An array of attributes with the label class
+	 */
+	public function getLabelClasses()
+	{
+		return 'control-label';
+	}
+
+	/**
+	 * Add uneditable field classes
+	 *
+	 * @param  array $attributes The attributes
+	 *
+	 * @return array An array of attributes with the uneditable class
+	 */
+	public function getUneditableClasses()
+	{
+		return 'uneditable-input';
+	}
+
+	/**
+	 * Add form class
+	 *
+	 * @param  array  $attributes The attributes
+	 * @param  string $type       The type of form to add
+	 *
+	 * @return array
+	 */
+	public function getFormClasses($type)
+	{
+		return $type ? 'form-'.$type : null;
+	}
+
+	/**
+	 * Add actions block class
+	 *
+	 * @param  array $attributes The attributes
+	 *
+	 * @return array
+	 */
+	public function getActionClasses()
+	{
+		return 'form-actions';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// RENDER BLOCKS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Render an help text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return string
+	 */
+	public function createHelp($text, $attributes = array())
+	{
+		return Element::create('span', $text, $attributes)->addClass('help-inline');
+	}
+
+	/**
+	 * Render a block help text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return string
+	 */
+	public function createBlockHelp($text, $attributes = array())
+	{
+		return Element::create('p', $text, $attributes)->addClass('help-block');
+	}
+
+	/**
+	 * Render a disabled field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function createDisabledField(Field $field)
+	{
+		return Element::create('span', $field->getValue(), $field->getAttributes());
+	}
+
+	/**
+	 * Render an icon
+	 *
+	 * @param string $icon         The icon name
+	 * @param array  $attributes   Its general attributes
+	 * @param array  $iconSettings Icon-specific settings
+	 *
+	 * @return string
+	 */
+	public function createIcon($iconType, $attributes = array(), $iconSettings = array())
+	{
+		// Check for empty icons
+		if (!$iconType) {
+			return false;
+		}
+
+		// Create tag
+		$tag  = array_get($iconSettings, 'tag', $this->iconTag);
+		$icon = Element::create($tag, null, $attributes);
+
+		// White icons ignore user overrides to use legacy Bootstrap styling
+		if (Str::contains($iconType, 'white')) {
+			$iconType = str_replace('white', '', $iconType);
+			$iconType = trim($iconType, '-');
+			$icon->addClass('icon-white');
+			$set    = null;
+			$prefix = 'icon';
+		} else {
+			$set    = array_get($iconSettings, 'set', $this->iconSet);
+			$prefix = array_get($iconSettings, 'prefix', $this->iconPrefix);
+		}
+		$icon->addClass("$set $prefix-$iconType");
+
+		return $icon;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// WRAP BLOCKS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Wrap an item to be prepended or appended to the current field
+	 *
+	 * @param  string $item
+	 *
+	 * @return string A wrapped item
+	 */
+	public function placeAround($item)
+	{
+		// Render object
+		if (is_object($item) and method_exists($item, '__toString')) {
+			$item = $item->__toString();
+		}
+
+		// Return unwrapped if button
+		if (strpos($item, '<button') !== false) {
+			return $item;
+		}
+
+		return Element::create('span', $item)->addClass('add-on');
+	}
+
+	/**
+	 * Wrap a field with prepended and appended items
+	 *
+	 * @param  Field $field
+	 * @param  array $prepend
+	 * @param  array $append
+	 *
+	 * @return string A field concatented with prepended and/or appended items
+	 */
+	public function prependAppend($field, $prepend, $append)
+	{
+		$class = array();
+		if ($prepend) {
+			$class[] = 'input-prepend';
+		}
+		if ($append) {
+			$class[] = 'input-append';
+		}
+
+		$return = '<div class="'.join(' ', $class).'">';
+		$return .= join(null, $prepend);
+		$return .= $field->render();
+		$return .= join(null, $append);
+		$return .= '</div>';
+
+		return $return;
+	}
+
+	/**
+	 * Wrap a field with potential additional tags
+	 *
+	 * @param  Field $field
+	 *
+	 * @return string A wrapped field
+	 */
+	public function wrapField($field)
+	{
+		return Element::create('div', $field)->addClass('controls');
+	}
+
+	/**
+	 * Wrap actions block with potential additional tags
+	 *
+	 * @param  Actions $action
+	 *
+	 * @return string A wrapped actions block
+	 */
+	public function wrapActions($actions)
+	{
+		return $actions;
+	}
 }
diff --git a/src/Former/Framework/TwitterBootstrap3.php b/src/Former/Framework/TwitterBootstrap3.php
index 18963eab..4951f988 100644
--- a/src/Former/Framework/TwitterBootstrap3.php
+++ b/src/Former/Framework/TwitterBootstrap3.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Framework;
 
-use Former\Form\Form;
 use Former\Interfaces\FrameworkInterface;
 use Former\Traits\Field;
 use Former\Traits\Framework;
@@ -14,395 +13,415 @@
  */
 class TwitterBootstrap3 extends Framework implements FrameworkInterface
 {
-  /**
-   * Form types that trigger special styling for this Framework
-   *
-   * @var array
-   */
-  protected $availableTypes = array('horizontal', 'vertical', 'inline');
-
-  /**
-   * The button types available
-   *
-   * @var array
-   */
-  private $buttons = array(
-    'lg', 'sm', 'xs', 'block', 'link',
-    'default', 'primary', 'warning',  'danger', 'success', 'info',
-  );
-
-  /**
-   * The field sizes available
-   *
-   * @var array
-   */
-  private $fields = array(
-    'lg','sm',
-    // 'col-xs-1', 'col-xs-2', 'col-xs-3', 'col-xs-4', 'col-xs-5', 'col-xs-6',
-    // 'col-xs-7', 'col-xs-8', 'col-xs-9', 'col-xs-10', 'col-xs-11', 'col-xs-12',
-    // 'col-sm-1', 'col-sm-2', 'col-sm-3', 'col-sm-4', 'col-sm-5', 'col-sm-6',
-    // 'col-sm-7', 'col-sm-8', 'col-sm-9', 'col-sm-10', 'col-sm-11', 'col-sm-12',
-    // 'col-md-1', 'col-md-2', 'col-md-3', 'col-md-4', 'col-md-5', 'col-md-6',
-    // 'col-md-7', 'col-md-8', 'col-md-9', 'col-md-10', 'col-md-11', 'col-md-12',
-    // 'col-lg-1', 'col-lg-2', 'col-lg-3', 'col-lg-4', 'col-lg-5', 'col-lg-6',
-    // 'col-lg-7', 'col-lg-8', 'col-lg-9', 'col-lg-10', 'col-lg-11', 'col-lg-12',
-  );
-
-  /**
-   * The field states available
-   *
-   * @var array
-   */
-  protected $states = array(
-    'has-warning', 'has-error', 'has-success',
-  );
-
-  /**
-   * The default HTML tag used for icons
-   *
-   * @var string
-   */
-  protected $iconTag = 'span';
-
-  /**
-   * The default set for icon fonts
-   * By default Bootstrap 3 offers only 'glyphicon'
-   * See Former docs to use 'social' and 'filetypes' sets for specific icons.
-   *
-   * @var string
-   */
-  protected $iconSet = 'glyphicon';
-
-  /**
-   * The default prefix icon names
-   * "icon" works for Bootstrap 2 and Font-awesome
-   *
-   * @var string
-   */
-  protected $iconPrefix = 'glyphicon';
-
-  /**
-   * Create a new TwitterBootstrap instance
-   *
-   * @param \Illuminate\Container\Container $app
-   */
-  public function __construct(Container $app)
-  {
-    $this->app = $app;
-    $this->setFrameworkDefaults();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// FILTER ARRAYS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Filter buttons classes
-   *
-   * @param  array $classes An array of classes
-   * @return array A filtered array
-   */
-  public function filterButtonClasses($classes)
-  {
-    // Filter classes
-    // $classes = array_intersect($classes, $this->buttons);
-
-    // Prepend button type
-    $classes = $this->prependWith($classes, 'btn-');
-    $classes[] = 'btn';
-
-    return $classes;
-  }
-
-  /**
-   * Filter field classes
-   *
-   * @param  array $classes An array of classes
-   * @return array A filtered array
-   */
-  public function filterFieldClasses($classes)
-  {
-    // Filter classes
-    $classes = array_intersect($classes, $this->fields);
-
-    // Prepend field type
-    $classes = array_map(function ($class) {
-      return Str::startsWith($class, 'col') ? $class : 'input-'.$class;
-    }, $classes);
-
-    return $classes;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Framework error state
-   *
-   * @return string
-   */
-  public function errorState()
-  {
-    return 'has-error';
-  }
-
-  /**
-   * Returns corresponding inline class of a field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function getInlineLabelClass($field)
-  {
-    $inlineClass = parent::getInlineLabelClass($field);
-    if ($field->isOfType('checkbox', 'checkboxes')) {
-      $inlineClass = 'checkbox-'.$inlineClass;
-    } elseif ($field->isOfType('radio', 'radios')) {
-      $inlineClass = 'radio-'.$inlineClass;
-    }
-
-    return $inlineClass;
-  }
-
-  /**
-   * Set the fields width from a label width
-   *
-   * @param array $labelWidths
-   */
-  protected function setFieldWidths($labelWidths)
-  {
-    $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-    $viewports = $this->getFrameworkOption('viewports');
-    foreach ($labelWidths as $viewport => $columns) {
-      if ($viewport) {
-        $labelWidthClass  .= " col-$viewports[$viewport]-$columns";
-        $fieldWidthClass  .= " col-$viewports[$viewport]-".(12-$columns);
-        $fieldOffsetClass .= " col-$viewports[$viewport]-offset-$columns";
-      }
-    }
-
-    $this->labelWidth  = ltrim($labelWidthClass);
-    $this->fieldWidth  = ltrim($fieldWidthClass);
-    $this->fieldOffset = ltrim($fieldOffsetClass);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// ADD CLASSES //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Add classes to a field
-   *
-   * @param Field $field
-   * @param array $classes The possible classes to add
-   *
-   * @return Field
-   */
-  public function getFieldClasses(Field $field, $classes)
-  {
-    // Add inline class for checkables
-    if ($field->isCheckable() and in_array('inline', $classes)) {
-      $field->inline();
-    }
-
-    // Filter classes according to field type
-    if ($field->isButton()) {
-      $classes = $this->filterButtonClasses($classes);
-    } else {
-      $classes = $this->filterFieldClasses($classes);
-    }
-
-    // Add form-control class for text-type, textarea and select fields
-    // As text-type is open-ended we instead exclude those that shouldn't receive the class
-    if (!$field->isCheckable() and !$field->isButton() and $field->getType() != 'file' and !in_array('form-control', $classes)) {
-      $classes[] = 'form-control';
-    }
-
-    return $this->addClassesToField($field, $classes);
-  }
-
-  /**
-   * Add group classes
-   *
-   * @return string A list of group classes
-   */
-  public function getGroupClasses()
-  {
-    return 'form-group';
-  }
-
-  /**
-   * Add label classes
-   *
-   * @param  array $attributes An array of attributes
-   * @return array An array of attributes with the label class
-   */
-  public function getLabelClasses()
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return array('control-label', $this->labelWidth);
-    } elseif ($this->app['former.form']->isOfType('inline')) {
-      return array('sr-only');
-    } else {
-      return array('control-label');
-    }
-  }
-
-  /**
-   * Add uneditable field classes
-   *
-   * @param  array $attributes The attributes
-   * @return array An array of attributes with the uneditable class
-   */
-  public function getUneditableClasses()
-  {
-    return '';
-  }
-
-  /**
-   * Add form class
-   *
-   * @param  array  $attributes The attributes
-   * @param  string $type       The type of form to add
-   * @return array
-   */
-  public function getFormClasses($type)
-  {
-    return $type ? 'form-'.$type : null;
-  }
-
-  /**
-   * Add actions block class
-   *
-   * @param  array  $attributes The attributes
-   * @return array
-   */
-  public function getActionClasses()
-  {
-    if ($this->app['former.form']->isOfType('horizontal') || $this->app['former.form']->isOfType('inline')) {
-      return 'form-group';
-    }
-
-    return null;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// RENDER BLOCKS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Render an help text
-   *
-   * @param string $text
-   * @param array  $attributes
-   *
-   * @return string
-   */
-  public function createHelp($text, $attributes = array())
-  {
-    return Element::create('span', $text, $attributes)->addClass('help-block');
-  }
-
-  /**
-   * Render an help text
-   *
-   * @param string $text
-   * @param array  $attributes
-   *
-   * @return string
-   */
-  public function createBlockHelp($text, $attributes = array())
-  {
-    return Element::create('p', $text, $attributes)->addClass('help-block');
-  }
-
-  /**
-   * Render a disabled field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function createDisabledField(Field $field)
-  {
-    return Element::create('span', $field->getValue(), $field->getAttributes());
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// WRAP BLOCKS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Wrap an item to be prepended or appended to the current field
-   *
-   * @param  string $field
-   *
-   * @return string A wrapped item
-   */
-  public function placeAround($item)
-  {
-    // Render object
-    if (is_object($item) and method_exists($item, '__toString')) {
-      $item = $item->__toString();
-    }
-
-    // Get class to use
-    $class = (strpos($item, '<button') !== false) ? 'btn' : 'addon';
-
-    return Element::create('span', $item)->addClass('input-group-'.$class);
-  }
-
-  /**
-   * Wrap a field with prepended and appended items
-   *
-   * @param  Field $field
-   * @param  array $prepend
-   * @param  array $append
-   *
-   * @return string A field concatented with prepended and/or appended items
-   */
-  public function prependAppend($field, $prepend, $append)
-  {
-    $return = '<div class="input-group">';
-      $return .= join(null, $prepend);
-      $return .= $field->render();
-      $return .= join(null, $append);
-    $return .= '</div>';
-
-    return $return;
-  }
-
-  /**
-   * Wrap a field with potential additional tags
-   *
-   * @param  Field $field
-   * @return string A wrapped field
-   */
-  public function wrapField($field)
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return Element::create('div', $field)->addClass($this->fieldWidth);
-    }
-
-    return $field;
-  }
-
-  /**
-   * Wrap actions block with potential additional tags
-   *
-   * @param  Actions $action
-   * @return string A wrapped actions block
-   */
-  public function wrapActions($actions)
-  {
-    // For horizontal forms, we wrap the actions in a div
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
-    }
-
-    return $actions;
-  }
+	/**
+	 * Form types that trigger special styling for this Framework
+	 *
+	 * @var array
+	 */
+	protected $availableTypes = array('horizontal', 'vertical', 'inline');
+
+	/**
+	 * The button types available
+	 *
+	 * @var array
+	 */
+	private $buttons = array(
+		'lg',
+		'sm',
+		'xs',
+		'block',
+		'link',
+		'default',
+		'primary',
+		'warning',
+		'danger',
+		'success',
+		'info',
+	);
+
+	/**
+	 * The field sizes available
+	 *
+	 * @var array
+	 */
+	private $fields = array(
+		'lg',
+		'sm',
+		// 'col-xs-1', 'col-xs-2', 'col-xs-3', 'col-xs-4', 'col-xs-5', 'col-xs-6',
+		// 'col-xs-7', 'col-xs-8', 'col-xs-9', 'col-xs-10', 'col-xs-11', 'col-xs-12',
+		// 'col-sm-1', 'col-sm-2', 'col-sm-3', 'col-sm-4', 'col-sm-5', 'col-sm-6',
+		// 'col-sm-7', 'col-sm-8', 'col-sm-9', 'col-sm-10', 'col-sm-11', 'col-sm-12',
+		// 'col-md-1', 'col-md-2', 'col-md-3', 'col-md-4', 'col-md-5', 'col-md-6',
+		// 'col-md-7', 'col-md-8', 'col-md-9', 'col-md-10', 'col-md-11', 'col-md-12',
+		// 'col-lg-1', 'col-lg-2', 'col-lg-3', 'col-lg-4', 'col-lg-5', 'col-lg-6',
+		// 'col-lg-7', 'col-lg-8', 'col-lg-9', 'col-lg-10', 'col-lg-11', 'col-lg-12',
+	);
+
+	/**
+	 * The field states available
+	 *
+	 * @var array
+	 */
+	protected $states = array(
+		'has-warning',
+		'has-error',
+		'has-success',
+	);
+
+	/**
+	 * The default HTML tag used for icons
+	 *
+	 * @var string
+	 */
+	protected $iconTag = 'span';
+
+	/**
+	 * The default set for icon fonts
+	 * By default Bootstrap 3 offers only 'glyphicon'
+	 * See Former docs to use 'social' and 'filetypes' sets for specific icons.
+	 *
+	 * @var string
+	 */
+	protected $iconSet = 'glyphicon';
+
+	/**
+	 * The default prefix icon names
+	 * "icon" works for Bootstrap 2 and Font-awesome
+	 *
+	 * @var string
+	 */
+	protected $iconPrefix = 'glyphicon';
+
+	/**
+	 * Create a new TwitterBootstrap instance
+	 *
+	 * @param \Illuminate\Container\Container $app
+	 */
+	public function __construct(Container $app)
+	{
+		$this->app = $app;
+		$this->setFrameworkDefaults();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// FILTER ARRAYS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Filter buttons classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return array A filtered array
+	 */
+	public function filterButtonClasses($classes)
+	{
+		// Filter classes
+		// $classes = array_intersect($classes, $this->buttons);
+
+		// Prepend button type
+		$classes   = $this->prependWith($classes, 'btn-');
+		$classes[] = 'btn';
+
+		return $classes;
+	}
+
+	/**
+	 * Filter field classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return array A filtered array
+	 */
+	public function filterFieldClasses($classes)
+	{
+		// Filter classes
+		$classes = array_intersect($classes, $this->fields);
+
+		// Prepend field type
+		$classes = array_map(function ($class) {
+			return Str::startsWith($class, 'col') ? $class : 'input-'.$class;
+		}, $classes);
+
+		return $classes;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Framework error state
+	 *
+	 * @return string
+	 */
+	public function errorState()
+	{
+		return 'has-error';
+	}
+
+	/**
+	 * Returns corresponding inline class of a field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function getInlineLabelClass($field)
+	{
+		$inlineClass = parent::getInlineLabelClass($field);
+		if ($field->isOfType('checkbox', 'checkboxes')) {
+			$inlineClass = 'checkbox-'.$inlineClass;
+		} elseif ($field->isOfType('radio', 'radios')) {
+			$inlineClass = 'radio-'.$inlineClass;
+		}
+
+		return $inlineClass;
+	}
+
+	/**
+	 * Set the fields width from a label width
+	 *
+	 * @param array $labelWidths
+	 */
+	protected function setFieldWidths($labelWidths)
+	{
+		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+		$viewports = $this->getFrameworkOption('viewports');
+		foreach ($labelWidths as $viewport => $columns) {
+			if ($viewport) {
+				$labelWidthClass .= " col-$viewports[$viewport]-$columns";
+				$fieldWidthClass .= " col-$viewports[$viewport]-".(12 - $columns);
+				$fieldOffsetClass .= " col-$viewports[$viewport]-offset-$columns";
+			}
+		}
+
+		$this->labelWidth  = ltrim($labelWidthClass);
+		$this->fieldWidth  = ltrim($fieldWidthClass);
+		$this->fieldOffset = ltrim($fieldOffsetClass);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// ADD CLASSES //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Add classes to a field
+	 *
+	 * @param Field $field
+	 * @param array $classes The possible classes to add
+	 *
+	 * @return Field
+	 */
+	public function getFieldClasses(Field $field, $classes)
+	{
+		// Add inline class for checkables
+		if ($field->isCheckable() and in_array('inline', $classes)) {
+			$field->inline();
+		}
+
+		// Filter classes according to field type
+		if ($field->isButton()) {
+			$classes = $this->filterButtonClasses($classes);
+		} else {
+			$classes = $this->filterFieldClasses($classes);
+		}
+
+		// Add form-control class for text-type, textarea and select fields
+		// As text-type is open-ended we instead exclude those that shouldn't receive the class
+		if (!$field->isCheckable() and !$field->isButton() and $field->getType() != 'file' and !in_array('form-control', $classes)) {
+			$classes[] = 'form-control';
+		}
+
+		return $this->addClassesToField($field, $classes);
+	}
+
+	/**
+	 * Add group classes
+	 *
+	 * @return string A list of group classes
+	 */
+	public function getGroupClasses()
+	{
+		return 'form-group';
+	}
+
+	/**
+	 * Add label classes
+	 *
+	 * @param  array $attributes An array of attributes
+	 *
+	 * @return array An array of attributes with the label class
+	 */
+	public function getLabelClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return array('control-label', $this->labelWidth);
+		} elseif ($this->app['former.form']->isOfType('inline')) {
+			return array('sr-only');
+		} else {
+			return array('control-label');
+		}
+	}
+
+	/**
+	 * Add uneditable field classes
+	 *
+	 * @param  array $attributes The attributes
+	 *
+	 * @return array An array of attributes with the uneditable class
+	 */
+	public function getUneditableClasses()
+	{
+		return '';
+	}
+
+	/**
+	 * Add form class
+	 *
+	 * @param  array  $attributes The attributes
+	 * @param  string $type       The type of form to add
+	 *
+	 * @return array
+	 */
+	public function getFormClasses($type)
+	{
+		return $type ? 'form-'.$type : null;
+	}
+
+	/**
+	 * Add actions block class
+	 *
+	 * @param  array $attributes The attributes
+	 *
+	 * @return array
+	 */
+	public function getActionClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal') || $this->app['former.form']->isOfType('inline')) {
+			return 'form-group';
+		}
+
+		return null;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// RENDER BLOCKS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Render an help text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return string
+	 */
+	public function createHelp($text, $attributes = array())
+	{
+		return Element::create('span', $text, $attributes)->addClass('help-block');
+	}
+
+	/**
+	 * Render an help text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return string
+	 */
+	public function createBlockHelp($text, $attributes = array())
+	{
+		return Element::create('p', $text, $attributes)->addClass('help-block');
+	}
+
+	/**
+	 * Render a disabled field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function createDisabledField(Field $field)
+	{
+		return Element::create('span', $field->getValue(), $field->getAttributes());
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// WRAP BLOCKS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Wrap an item to be prepended or appended to the current field
+	 *
+	 * @param  string $field
+	 *
+	 * @return string A wrapped item
+	 */
+	public function placeAround($item)
+	{
+		// Render object
+		if (is_object($item) and method_exists($item, '__toString')) {
+			$item = $item->__toString();
+		}
+
+		// Get class to use
+		$class = (strpos($item, '<button') !== false) ? 'btn' : 'addon';
+
+		return Element::create('span', $item)->addClass('input-group-'.$class);
+	}
+
+	/**
+	 * Wrap a field with prepended and appended items
+	 *
+	 * @param  Field $field
+	 * @param  array $prepend
+	 * @param  array $append
+	 *
+	 * @return string A field concatented with prepended and/or appended items
+	 */
+	public function prependAppend($field, $prepend, $append)
+	{
+		$return = '<div class="input-group">';
+		$return .= join(null, $prepend);
+		$return .= $field->render();
+		$return .= join(null, $append);
+		$return .= '</div>';
+
+		return $return;
+	}
+
+	/**
+	 * Wrap a field with potential additional tags
+	 *
+	 * @param  Field $field
+	 *
+	 * @return string A wrapped field
+	 */
+	public function wrapField($field)
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $field)->addClass($this->fieldWidth);
+		}
+
+		return $field;
+	}
+
+	/**
+	 * Wrap actions block with potential additional tags
+	 *
+	 * @param  Actions $action
+	 *
+	 * @return string A wrapped actions block
+	 */
+	public function wrapActions($actions)
+	{
+		// For horizontal forms, we wrap the actions in a div
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
+		}
+
+		return $actions;
+	}
 }
diff --git a/src/Former/Framework/ZurbFoundation.php b/src/Former/Framework/ZurbFoundation.php
index 24ac2928..1635c123 100644
--- a/src/Former/Framework/ZurbFoundation.php
+++ b/src/Former/Framework/ZurbFoundation.php
@@ -13,258 +13,260 @@
  */
 class ZurbFoundation extends Framework implements FrameworkInterface
 {
-  /**
-   * Form types that trigger special styling for this Framework
-   *
-   * @var array
-   */
-  protected $availableTypes = array('horizontal', 'vertical');
-
-  /**
-   * The field sizes available
-   *
-   * @var array
-   */
-  private $fields = array(
-    1 => 'one',
-    2 => 'two',
-    3 => 'three',
-    4 => 'four',
-    5 => 'five',
-    6 => 'six',
-    7 => 'seven',
-    8 => 'eight',
-    9 => 'nine',
-    10 => 'ten',
-    11 => 'eleven',
-    12 => 'twelve'
-  );
-
-  /**
-   * The field states available
-   *
-   * @var array
-   */
-  protected $states = array(
-    'error',
-  );
-
-  /**
-   * Create a new ZurbFoundation instance
-   *
-   * @param Container $app
-   */
-  public function __construct(Container $app)
-  {
-    $this->app = $app;
-    $this->setFrameworkDefaults();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// FILTER ARRAYS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function filterButtonClasses($classes)
-  {
-    return $classes;
-  }
-
-  public function filterFieldClasses($classes)
-  {
-    // Filter classes
-    $classes = array_intersect($classes, $this->fields);
-
-    return $classes;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  protected function setFieldWidths($labelWidths)
-  {
-    $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-    $viewports = $this->getFrameworkOption('viewports');
-
-    foreach ($labelWidths as $viewport => $columns) {
-      if ($viewport) {
-        $labelWidthClass .= $viewports[$viewport].$this->fields[$columns].' ';
-        $fieldWidthClass .= $viewports[$viewport].$this->fields[12-$columns].' ';
-        $fieldOffsetClass .= $viewports[$viewport].'offset-by-'.$this->fields[$columns].' ';
-      }
-    }
-
-    $this->labelWidth = $labelWidthClass . 'columns';
-    $this->fieldWidth = $fieldWidthClass . 'columns';
-    $this->fieldOffset = $fieldOffsetClass . 'columns';
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// ADD CLASSES //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function getFieldClasses(Field $field, $classes = array())
-  {
-    $classes = $this->filterFieldClasses($classes);
-
-    return $this->addClassesToField($field, $classes);
-  }
-
-  public function getGroupClasses()
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return 'row';
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Add label classes
-   *
-   * @param  array $attributes An array of attributes
-   * @return array An array of attributes with the label class
-   */
-  public function getLabelClasses()
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return $this->getFrameworkOption('wrappedLabelClasses');
-    } else {
-      return null;
-    }
-  }
-
-  public function getUneditableClasses()
-  {
-    return null;
-  }
-
-  public function getFormClasses($type)
-  {
-    return null;
-  }
-
-  public function getActionClasses()
-  {
-    return null;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// RENDER BLOCKS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function createHelp($text, $attributes = null)
-  {
-    if (is_null($attributes) or empty($attributes)) {
-        $attributes = $this->getFrameworkOption('error_classes');
-    }
-    return Element::create('span', $text, $attributes);
-  }
-
-  /**
-   * Render a disabled field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function createDisabledField(Field $field)
-  {
-    $field->disabled();
-
-    return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// WRAP BLOCKS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Wrap an item to be prepended or appended to the current field.
-   * For Zurb we return the item and handle the wrapping in prependAppend
-   * as wrapping is dependent on whether we're prepending or appending.
-   *
-   * @param  string $field
-   *
-   * @return string A wrapped item
-   */
-  public function placeAround($item)
-  {
-    return $item;
-  }
-
-  /**
-   * Wrap a field with prepended and appended items
-   *
-   * @param  Field $field
-   * @param  array $prepend
-   * @param  array $append
-   *
-   * @return string A field concatented with prepended and/or appended items
-   */
-  public function prependAppend($field, $prepend, $append)
-  {
-    $return = '';
-
-    foreach ($prepend as $item) {
-      $return .= '<div class="two mobile-one columns"><span class="prefix">'.$item.'</span></div>';
-    }
-
-    $return .= '<div class="ten mobile-three columns">'.$field->render().'</div>';
-
-    foreach ($append as $item) {
-      $return .= '<div class="two mobile-one columns"><span class="postfix">'.$item.'</span></div>';
-    }
-
-    return $return;
-  }
-
-  /**
-   * Wraps all label contents with potential additional tags.
-   *
-   * @param  string $label
-   *
-   * @return string A wrapped label
-   */
-  public function wrapLabel($label)
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return Element::create('div', $label)->addClass($this->labelWidth);
-    } else {
-      return $label;
-    }
-  }
-
-  /**
-   * Wraps all field contents with potential additional tags.
-   *
-   * @param  Field $field
-   *
-   * @return string A wrapped field
-   */
-  public function wrapField($field)
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return Element::create('div', $field)->addClass($this->fieldWidth);
-    } else {
-      return $field;
-    }
-  }
-
-  /**
-   * Wrap actions block with potential additional tags
-   *
-   * @param  Actions $action
-   * @return string A wrapped actions block
-   */
-  public function wrapActions($actions)
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return Element::create('div', $actions)->addClass(array($this->fieldOffset,$this->fieldWidth));
-    } else {
-      return $actions;
-    }
-  }
-
+	/**
+	 * Form types that trigger special styling for this Framework
+	 *
+	 * @var array
+	 */
+	protected $availableTypes = array('horizontal', 'vertical');
+
+	/**
+	 * The field sizes available
+	 *
+	 * @var array
+	 */
+	private $fields = array(
+		1  => 'one',
+		2  => 'two',
+		3  => 'three',
+		4  => 'four',
+		5  => 'five',
+		6  => 'six',
+		7  => 'seven',
+		8  => 'eight',
+		9  => 'nine',
+		10 => 'ten',
+		11 => 'eleven',
+		12 => 'twelve'
+	);
+
+	/**
+	 * The field states available
+	 *
+	 * @var array
+	 */
+	protected $states = array(
+		'error',
+	);
+
+	/**
+	 * Create a new ZurbFoundation instance
+	 *
+	 * @param Container $app
+	 */
+	public function __construct(Container $app)
+	{
+		$this->app = $app;
+		$this->setFrameworkDefaults();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// FILTER ARRAYS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function filterButtonClasses($classes)
+	{
+		return $classes;
+	}
+
+	public function filterFieldClasses($classes)
+	{
+		// Filter classes
+		$classes = array_intersect($classes, $this->fields);
+
+		return $classes;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+	////////////////////////////////////////////////////////////////////
+
+	protected function setFieldWidths($labelWidths)
+	{
+		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+		$viewports = $this->getFrameworkOption('viewports');
+
+		foreach ($labelWidths as $viewport => $columns) {
+			if ($viewport) {
+				$labelWidthClass .= $viewports[$viewport].$this->fields[$columns].' ';
+				$fieldWidthClass .= $viewports[$viewport].$this->fields[12 - $columns].' ';
+				$fieldOffsetClass .= $viewports[$viewport].'offset-by-'.$this->fields[$columns].' ';
+			}
+		}
+
+		$this->labelWidth  = $labelWidthClass.'columns';
+		$this->fieldWidth  = $fieldWidthClass.'columns';
+		$this->fieldOffset = $fieldOffsetClass.'columns';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// ADD CLASSES //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function getFieldClasses(Field $field, $classes = array())
+	{
+		$classes = $this->filterFieldClasses($classes);
+
+		return $this->addClassesToField($field, $classes);
+	}
+
+	public function getGroupClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return 'row';
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Add label classes
+	 *
+	 * @param  array $attributes An array of attributes
+	 *
+	 * @return array An array of attributes with the label class
+	 */
+	public function getLabelClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return $this->getFrameworkOption('wrappedLabelClasses');
+		} else {
+			return null;
+		}
+	}
+
+	public function getUneditableClasses()
+	{
+		return null;
+	}
+
+	public function getFormClasses($type)
+	{
+		return null;
+	}
+
+	public function getActionClasses()
+	{
+		return null;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// RENDER BLOCKS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function createHelp($text, $attributes = null)
+	{
+		if (is_null($attributes) or empty($attributes)) {
+			$attributes = $this->getFrameworkOption('error_classes');
+		}
+
+		return Element::create('span', $text, $attributes);
+	}
+
+	/**
+	 * Render a disabled field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function createDisabledField(Field $field)
+	{
+		$field->disabled();
+
+		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// WRAP BLOCKS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Wrap an item to be prepended or appended to the current field.
+	 * For Zurb we return the item and handle the wrapping in prependAppend
+	 * as wrapping is dependent on whether we're prepending or appending.
+	 *
+	 * @param  string $field
+	 *
+	 * @return string A wrapped item
+	 */
+	public function placeAround($item)
+	{
+		return $item;
+	}
+
+	/**
+	 * Wrap a field with prepended and appended items
+	 *
+	 * @param  Field $field
+	 * @param  array $prepend
+	 * @param  array $append
+	 *
+	 * @return string A field concatented with prepended and/or appended items
+	 */
+	public function prependAppend($field, $prepend, $append)
+	{
+		$return = '';
+
+		foreach ($prepend as $item) {
+			$return .= '<div class="two mobile-one columns"><span class="prefix">'.$item.'</span></div>';
+		}
+
+		$return .= '<div class="ten mobile-three columns">'.$field->render().'</div>';
+
+		foreach ($append as $item) {
+			$return .= '<div class="two mobile-one columns"><span class="postfix">'.$item.'</span></div>';
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Wraps all label contents with potential additional tags.
+	 *
+	 * @param  string $label
+	 *
+	 * @return string A wrapped label
+	 */
+	public function wrapLabel($label)
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $label)->addClass($this->labelWidth);
+		} else {
+			return $label;
+		}
+	}
+
+	/**
+	 * Wraps all field contents with potential additional tags.
+	 *
+	 * @param  Field $field
+	 *
+	 * @return string A wrapped field
+	 */
+	public function wrapField($field)
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $field)->addClass($this->fieldWidth);
+		} else {
+			return $field;
+		}
+	}
+
+	/**
+	 * Wrap actions block with potential additional tags
+	 *
+	 * @param  Actions $action
+	 *
+	 * @return string A wrapped actions block
+	 */
+	public function wrapActions($actions)
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
+		} else {
+			return $actions;
+		}
+	}
 }
diff --git a/src/Former/Framework/ZurbFoundation4.php b/src/Former/Framework/ZurbFoundation4.php
index 420a11a2..e620b1f0 100644
--- a/src/Former/Framework/ZurbFoundation4.php
+++ b/src/Former/Framework/ZurbFoundation4.php
@@ -13,256 +13,267 @@
  */
 class ZurbFoundation4 extends Framework implements FrameworkInterface
 {
-  /**
-   * Form types that trigger special styling for this Framework
-   *
-   * @var array
-   */
-  protected $availableTypes = array('horizontal', 'vertical');
-
-  /**
-   * The button types available
-   *
-   * @var array
-   */
-  private $buttons = array(
-    'tiny', 'small', 'medium', 'large', 'success', 'radius', 'round', 'disabled', 'prefix', 'postfix',
-  );
-
-  /**
-   * The field sizes available
-   * Zurb Foundation 4 does not apply sizes to the form element, but to the wrapper div
-   *
-   * @var array
-   */
-  private $fields = array();
-
-  /**
-   * The field states available
-   *
-   * @var array
-   */
-  protected $states = array(
-    'error',
-  );
-
-  /**
-   * Create a new ZurbFoundation instance
-   *
-   * @param \Illuminate\Container\Container $app
-   */
-  public function __construct(Container $app)
-  {
-    $this->app = $app;
-    $this->setFrameworkDefaults();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// FILTER ARRAYS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function filterButtonClasses($classes)
-  {
-    // Filter classes
-    $classes = array_intersect($classes, $this->buttons);
-    $classes[] = 'button';
-
-    return $classes;
-  }
-
-  public function filterFieldClasses($classes)
-  {
-    return null;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  protected function setFieldWidths($labelWidths)
-  {
-    $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-    $viewports = $this->getFrameworkOption('viewports');
-
-    foreach ($labelWidths as $viewport => $columns) {
-      if ($viewport) {
-        $labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
-        $fieldWidthClass .= $viewports[$viewport].'-'.(12-$columns).' ';
-        $fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
-      }
-    }
-
-    $this->labelWidth = $labelWidthClass . 'columns';
-    $this->fieldWidth = $fieldWidthClass . 'columns';
-    $this->fieldOffset = $fieldOffsetClass . 'columns';
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// ADD CLASSES //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function getFieldClasses(Field $field, $classes = array())
-  {
-    if ($field->isButton()) {
-      $classes = $this->filterButtonClasses($classes);
-    } else {
-      $classes = $this->filterFieldClasses($classes);
-    }
-
-    return $this->addClassesToField($field, $classes);
-  }
-
-  public function getGroupClasses()
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return 'row';
-    } else {
-      return null;
-    }
-  }
-
-  /**
-   * Add label classes
-   *
-   * @param  array $attributes An array of attributes
-   * @return array An array of attributes with the label class
-   */
-  public function getLabelClasses()
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return $this->getFrameworkOption('wrappedLabelClasses');
-    } else {
-      return null;
-    }
-  }
-
-  public function getUneditableClasses()
-  {
-    return null;
-  }
-
-  public function getFormClasses($type)
-  {
-    return null;
-  }
-
-  public function getActionClasses()
-  {
-    return null;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// RENDER BLOCKS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function createHelp($text, $attributes = null)
-  {
-    if (is_null($attributes) or empty($attributes)) {
-        $attributes = $this->getFrameworkOption('error_classes');
-    }
-    return Element::create('span', $text, $attributes);
-  }
-
-  /**
-   * Render a disabled field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function createDisabledField(Field $field)
-  {
-    $field->disabled();
-
-    return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// WRAP BLOCKS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Wrap an item to be prepended or appended to the current field.
-   * For Zurb we return the item and handle the wrapping in prependAppend
-   * as wrapping is dependent on whether we're prepending or appending.
-   *
-   * @param  string $field
-   *
-   * @return string A wrapped item
-   */
-  public function placeAround($item)
-  {
-    return $item;
-  }
-
-  /**
-   * Wrap a field with prepended and appended items
-   *
-   * @param  Field $field
-   * @param  array $prepend
-   * @param  array $append
-   *
-   * @return string A field concatented with prepended and/or appended items
-   */
-  public function prependAppend($field, $prepend, $append)
-  {
-    $return = '';
-
-    foreach ($prepend as $item) {
-      $return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
-    }
-
-    $return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
-
-    foreach ($append as $item) {
-      $return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
-    }
-
-    return $return;
-  }
-
-  /**
-   * Wraps all label contents with potential additional tags.
-   *
-   * @param  string $label
-   *
-   * @return string A wrapped label
-   */
-  public function wrapLabel($label)
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return Element::create('div', $label)->addClass($this->labelWidth);
-    } else {
-      return $label;
-    }
-  }
-
-  /**
-   * Wraps all field contents with potential additional tags.
-   *
-   * @param  Field $field
-   *
-   * @return string A wrapped field
-   */
-  public function wrapField($field)
-  {
-    if ($this->app['former.form']->isOfType('horizontal')) {
-      return Element::create('div', $field)->addClass($this->fieldWidth);
-    } else {
-      return $field;
-    }
-  }
-
-  /**
-   * Wrap actions block with potential additional tags
-   *
-   * @param  Actions $action
-   * @return string A wrapped actions block
-   */
-  public function wrapActions($actions)
-  {
-      return $actions;
-  }
-
+	/**
+	 * Form types that trigger special styling for this Framework
+	 *
+	 * @var array
+	 */
+	protected $availableTypes = array('horizontal', 'vertical');
+
+	/**
+	 * The button types available
+	 *
+	 * @var array
+	 */
+	private $buttons = array(
+		'tiny',
+		'small',
+		'medium',
+		'large',
+		'success',
+		'radius',
+		'round',
+		'disabled',
+		'prefix',
+		'postfix',
+	);
+
+	/**
+	 * The field sizes available
+	 * Zurb Foundation 4 does not apply sizes to the form element, but to the wrapper div
+	 *
+	 * @var array
+	 */
+	private $fields = array();
+
+	/**
+	 * The field states available
+	 *
+	 * @var array
+	 */
+	protected $states = array(
+		'error',
+	);
+
+	/**
+	 * Create a new ZurbFoundation instance
+	 *
+	 * @param \Illuminate\Container\Container $app
+	 */
+	public function __construct(Container $app)
+	{
+		$this->app = $app;
+		$this->setFrameworkDefaults();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// FILTER ARRAYS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function filterButtonClasses($classes)
+	{
+		// Filter classes
+		$classes   = array_intersect($classes, $this->buttons);
+		$classes[] = 'button';
+
+		return $classes;
+	}
+
+	public function filterFieldClasses($classes)
+	{
+		return null;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+	////////////////////////////////////////////////////////////////////
+
+	protected function setFieldWidths($labelWidths)
+	{
+		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+		$viewports = $this->getFrameworkOption('viewports');
+
+		foreach ($labelWidths as $viewport => $columns) {
+			if ($viewport) {
+				$labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
+				$fieldWidthClass .= $viewports[$viewport].'-'.(12 - $columns).' ';
+				$fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
+			}
+		}
+
+		$this->labelWidth  = $labelWidthClass.'columns';
+		$this->fieldWidth  = $fieldWidthClass.'columns';
+		$this->fieldOffset = $fieldOffsetClass.'columns';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// ADD CLASSES //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function getFieldClasses(Field $field, $classes = array())
+	{
+		if ($field->isButton()) {
+			$classes = $this->filterButtonClasses($classes);
+		} else {
+			$classes = $this->filterFieldClasses($classes);
+		}
+
+		return $this->addClassesToField($field, $classes);
+	}
+
+	public function getGroupClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return 'row';
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Add label classes
+	 *
+	 * @param  array $attributes An array of attributes
+	 *
+	 * @return array An array of attributes with the label class
+	 */
+	public function getLabelClasses()
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return $this->getFrameworkOption('wrappedLabelClasses');
+		} else {
+			return null;
+		}
+	}
+
+	public function getUneditableClasses()
+	{
+		return null;
+	}
+
+	public function getFormClasses($type)
+	{
+		return null;
+	}
+
+	public function getActionClasses()
+	{
+		return null;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// RENDER BLOCKS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function createHelp($text, $attributes = null)
+	{
+		if (is_null($attributes) or empty($attributes)) {
+			$attributes = $this->getFrameworkOption('error_classes');
+		}
+
+		return Element::create('span', $text, $attributes);
+	}
+
+	/**
+	 * Render a disabled field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function createDisabledField(Field $field)
+	{
+		$field->disabled();
+
+		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// WRAP BLOCKS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Wrap an item to be prepended or appended to the current field.
+	 * For Zurb we return the item and handle the wrapping in prependAppend
+	 * as wrapping is dependent on whether we're prepending or appending.
+	 *
+	 * @param  string $field
+	 *
+	 * @return string A wrapped item
+	 */
+	public function placeAround($item)
+	{
+		return $item;
+	}
+
+	/**
+	 * Wrap a field with prepended and appended items
+	 *
+	 * @param  Field $field
+	 * @param  array $prepend
+	 * @param  array $append
+	 *
+	 * @return string A field concatented with prepended and/or appended items
+	 */
+	public function prependAppend($field, $prepend, $append)
+	{
+		$return = '';
+
+		foreach ($prepend as $item) {
+			$return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
+		}
+
+		$return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
+
+		foreach ($append as $item) {
+			$return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Wraps all label contents with potential additional tags.
+	 *
+	 * @param  string $label
+	 *
+	 * @return string A wrapped label
+	 */
+	public function wrapLabel($label)
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $label)->addClass($this->labelWidth);
+		} else {
+			return $label;
+		}
+	}
+
+	/**
+	 * Wraps all field contents with potential additional tags.
+	 *
+	 * @param  Field $field
+	 *
+	 * @return string A wrapped field
+	 */
+	public function wrapField($field)
+	{
+		if ($this->app['former.form']->isOfType('horizontal')) {
+			return Element::create('div', $field)->addClass($this->fieldWidth);
+		} else {
+			return $field;
+		}
+	}
+
+	/**
+	 * Wrap actions block with potential additional tags
+	 *
+	 * @param  Actions $action
+	 *
+	 * @return string A wrapped actions block
+	 */
+	public function wrapActions($actions)
+	{
+		return $actions;
+	}
 }
diff --git a/src/Former/Helpers.php b/src/Former/Helpers.php
index ff87e59c..e8483744 100644
--- a/src/Former/Helpers.php
+++ b/src/Former/Helpers.php
@@ -9,137 +9,156 @@
  */
 class Helpers
 {
-  /**
-   * The IoC Container
-   *
-   * @var Container
-   */
-  protected static $app;
-
-  /**
-   * Bind a Container to the Helpers class
-   *
-   * @param Container $app
-   */
-  public static function setApp(Container $app)
-  {
-    static::$app = $app;
-  }
-
-  /**
-   * Encodes HTML
-   *
-   * @param string $value The string to encode
-   *
-   * @return string
-   */
-  public static function encode($value)
-  {
-    return htmlentities($value, ENT_QUOTES, 'UTF-8', true);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////// LOCALIZATION HELPERS /////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Translates a string by trying several fallbacks
-   *
-   * @param  string $key      The key to translate
-   * @param  string $fallback The ultimate fallback
-   * @return string           A translated string
-   */
-  public static function translate($key, $fallback = null)
-  {
-    // If nothing was given, return nothing, bitch
-    if (!$key) {
-      return null;
-    }
-
-    // If no fallback, use the key
-    if (!$fallback) {
-      $fallback = $key;
-    }
-
-    // Assure we don't already have a Lang object
-    if (is_object($key) and method_exists($key, 'get')) {
-      return $key->get();
-    }
-
-    $translation   = null;
-    $translateFrom = static::$app['former']->getOption('translate_from');
-    if (substr($translateFrom, -1) !== '/') {
-      $translateFrom .= '.';
-    }
-    $translateFrom .= $key;
-
-    // Convert a[b[c]] to a.b.c for nested translations [a => [b => 'B!']]
-    if (strpos($translateFrom, ']') !== false) {
-      $translateFrom = str_replace(array(']', '['), array('', '.'), $translateFrom);
-    }
-
-    // Search for the key itself
-    if (static::$app['translator']->has($key)) {
-      $translation = static::$app['translator']->get($key);
-    } elseif (static::$app['translator']->has($translateFrom)) {
-      $translation  = static::$app['translator']->get($translateFrom);
-    }
-
-    // Replace by fallback if invalid
-    if (!$translation or is_array($translation)) {
-      $translation = $fallback;
-    }
-
-    // Capitalize
-    $capitalize = static::$app['former']->getOption('capitalize_translations');
-
-    return $capitalize ? ucfirst($translation) : $translation;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// DATABASE HELPERS ////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Transforms an array of models into an associative array
-   *
-   * @param  array|object $query The array of results
-   * @param  string       $value The attribute to use as value
-   * @param  string       $key   The attribute to use as key
-   * @return array               A data array
-   */
-  public static function queryToArray($query, $value = null, $key = null)
-  {
-    // Automatically fetch Lang objects for people who store translated options lists
-    // Same of unfetched queries
-    if (!$query instanceof Collection) {
-      if (method_exists($query, 'get')) $query = $query->get();
-      if (!is_array($query)) $query = (array) $query;
-    }
-
-    // Populates the new options
-    foreach ($query as $model) {
-
-      // If it's an array, convert to object
-      if (is_array($model)) $model = (object) $model;
-
-      // Calculate the value
-      if ($value and isset($model->$value)) $modelValue = $model->$value;
-      elseif (method_exists($model, '__toString')) $modelValue = $model->__toString();
-      else $modelValue = null;
-
-      // Calculate the key
-      if ($key and isset($model->$key)) $modelKey = $model->$key;
-      elseif (method_exists($model, 'getKey')) $modelKey = $model->getKey();
-      elseif (isset($model->id)) $modelKey = $model->id;
-      else $modelKey = $modelValue;
-
-      // Skip if no text value found
-      if (!$modelValue) continue;
-
-      $array[$modelKey] = (string) $modelValue;
-    }
-
-    return isset($array) ? $array : $query;
-  }
+	/**
+	 * The IoC Container
+	 *
+	 * @var Container
+	 */
+	protected static $app;
+
+	/**
+	 * Bind a Container to the Helpers class
+	 *
+	 * @param Container $app
+	 */
+	public static function setApp(Container $app)
+	{
+		static::$app = $app;
+	}
+
+	/**
+	 * Encodes HTML
+	 *
+	 * @param string $value The string to encode
+	 *
+	 * @return string
+	 */
+	public static function encode($value)
+	{
+		return htmlentities($value, ENT_QUOTES, 'UTF-8', true);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////// LOCALIZATION HELPERS /////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Translates a string by trying several fallbacks
+	 *
+	 * @param  string $key      The key to translate
+	 * @param  string $fallback The ultimate fallback
+	 *
+	 * @return string           A translated string
+	 */
+	public static function translate($key, $fallback = null)
+	{
+		// If nothing was given, return nothing, bitch
+		if (!$key) {
+			return null;
+		}
+
+		// If no fallback, use the key
+		if (!$fallback) {
+			$fallback = $key;
+		}
+
+		// Assure we don't already have a Lang object
+		if (is_object($key) and method_exists($key, 'get')) {
+			return $key->get();
+		}
+
+		$translation   = null;
+		$translateFrom = static::$app['former']->getOption('translate_from');
+		if (substr($translateFrom, -1) !== '/') {
+			$translateFrom .= '.';
+		}
+		$translateFrom .= $key;
+
+		// Convert a[b[c]] to a.b.c for nested translations [a => [b => 'B!']]
+		if (strpos($translateFrom, ']') !== false) {
+			$translateFrom = str_replace(array(']', '['), array('', '.'), $translateFrom);
+		}
+
+		// Search for the key itself
+		if (static::$app['translator']->has($key)) {
+			$translation = static::$app['translator']->get($key);
+		} elseif (static::$app['translator']->has($translateFrom)) {
+			$translation = static::$app['translator']->get($translateFrom);
+		}
+
+		// Replace by fallback if invalid
+		if (!$translation or is_array($translation)) {
+			$translation = $fallback;
+		}
+
+		// Capitalize
+		$capitalize = static::$app['former']->getOption('capitalize_translations');
+
+		return $capitalize ? ucfirst($translation) : $translation;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// DATABASE HELPERS ////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Transforms an array of models into an associative array
+	 *
+	 * @param  array|object $query The array of results
+	 * @param  string       $value The attribute to use as value
+	 * @param  string       $key   The attribute to use as key
+	 *
+	 * @return array               A data array
+	 */
+	public static function queryToArray($query, $value = null, $key = null)
+	{
+		// Automatically fetch Lang objects for people who store translated options lists
+		// Same of unfetched queries
+		if (!$query instanceof Collection) {
+			if (method_exists($query, 'get')) {
+				$query = $query->get();
+			}
+			if (!is_array($query)) {
+				$query = (array) $query;
+			}
+		}
+
+		// Populates the new options
+		foreach ($query as $model) {
+
+			// If it's an array, convert to object
+			if (is_array($model)) {
+				$model = (object) $model;
+			}
+
+			// Calculate the value
+			if ($value and isset($model->$value)) {
+				$modelValue = $model->$value;
+			} elseif (method_exists($model, '__toString')) {
+				$modelValue = $model->__toString();
+			} else {
+				$modelValue = null;
+			}
+
+			// Calculate the key
+			if ($key and isset($model->$key)) {
+				$modelKey = $model->$key;
+			} elseif (method_exists($model, 'getKey')) {
+				$modelKey = $model->getKey();
+			} elseif (isset($model->id)) {
+				$modelKey = $model->id;
+			} else {
+				$modelKey = $modelValue;
+			}
+
+			// Skip if no text value found
+			if (!$modelValue) {
+				continue;
+			}
+
+			$array[$modelKey] = (string) $modelValue;
+		}
+
+		return isset($array) ? $array : $query;
+	}
 }
diff --git a/src/Former/Interfaces/FieldInterface.php b/src/Former/Interfaces/FieldInterface.php
index 8ca389ee..a64ba919 100644
--- a/src/Former/Interfaces/FieldInterface.php
+++ b/src/Former/Interfaces/FieldInterface.php
@@ -6,10 +6,10 @@
  */
 interface FieldInterface
 {
-  /**
-   * Renders the field
-   *
-   * @return string
-   */
-  public function render();
+	/**
+	 * Renders the field
+	 *
+	 * @return string
+	 */
+	public function render();
 }
diff --git a/src/Former/Interfaces/FrameworkInterface.php b/src/Former/Interfaces/FrameworkInterface.php
index cbc1f5bb..182699b1 100644
--- a/src/Former/Interfaces/FrameworkInterface.php
+++ b/src/Former/Interfaces/FrameworkInterface.php
@@ -8,133 +8,133 @@
  */
 interface FrameworkInterface
 {
-  /**
-   * Filter buttons classes
-   *
-   * @param  array $classes An array of classes
-   *
-   * @return array A filtered array
-   */
-  public function filterButtonClasses($classes);
+	/**
+	 * Filter buttons classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return array A filtered array
+	 */
+	public function filterButtonClasses($classes);
 
-  /**
-   * Filter field classes
-   *
-   * @param  array $classes An array of classes
-   *
-   * @return array A filtered array
-   */
-  public function filterFieldClasses($classes);
+	/**
+	 * Filter field classes
+	 *
+	 * @param  array $classes An array of classes
+	 *
+	 * @return array A filtered array
+	 */
+	public function filterFieldClasses($classes);
 
-  /**
-   * Add classes to a field
-   *
-   * @param Field $field
-   * @param array $classes The possible classes to add
-   *
-   * @return Field
-   */
-  public function getFieldClasses(Field $field, $classes);
+	/**
+	 * Add classes to a field
+	 *
+	 * @param Field $field
+	 * @param array $classes The possible classes to add
+	 *
+	 * @return Field
+	 */
+	public function getFieldClasses(Field $field, $classes);
 
-  /**
-   * Add group classes
-   *
-   * @return string A list of group classes
-   */
-  public function getGroupClasses();
+	/**
+	 * Add group classes
+	 *
+	 * @return string A list of group classes
+	 */
+	public function getGroupClasses();
 
-  /**
-   * Add label classes
-   *
-   * @param  array $attributes An array of attributes
-   *
-   * @return array An array of attributes with the label class
-   */
-  public function getLabelClasses();
+	/**
+	 * Add label classes
+	 *
+	 * @param  array $attributes An array of attributes
+	 *
+	 * @return array An array of attributes with the label class
+	 */
+	public function getLabelClasses();
 
-  /**
-   * Add uneditable field classes
-   *
-   * @param  array $attributes The attributes
-   *
-   * @return array An array of attributes with the uneditable class
-   */
-  public function getUneditableClasses();
+	/**
+	 * Add uneditable field classes
+	 *
+	 * @param  array $attributes The attributes
+	 *
+	 * @return array An array of attributes with the uneditable class
+	 */
+	public function getUneditableClasses();
 
-  /**
-   * Add form class
-   *
-   * @param  array  $attributes The attributes
-   * @param  string $type       The type of form to add
-   *
-   * @return array
-   */
-  public function getFormClasses($type);
+	/**
+	 * Add form class
+	 *
+	 * @param  array  $attributes The attributes
+	 * @param  string $type       The type of form to add
+	 *
+	 * @return array
+	 */
+	public function getFormClasses($type);
 
-  /**
-   * Add actions block class
-   *
-   * @param  array  $attributes The attributes
-   *
-   * @return array
-   */
-  public function getActionClasses();
+	/**
+	 * Add actions block class
+	 *
+	 * @param  array $attributes The attributes
+	 *
+	 * @return array
+	 */
+	public function getActionClasses();
 
-  /**
-   * Render an help text
-   *
-   * @param string $text
-   * @param array  $attributes
-   *
-   * @return string
-   */
-  public function createHelp($text, $attributes = array());
+	/**
+	 * Render an help text
+	 *
+	 * @param string $text
+	 * @param array  $attributes
+	 *
+	 * @return string
+	 */
+	public function createHelp($text, $attributes = array());
 
-  /**
-   * Render a disabled field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function createDisabledField(Field $field);
+	/**
+	 * Render a disabled field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function createDisabledField(Field $field);
 
-  /**
-   * Render an icon
-   *
-   * @param string $icon       The icon name
-   * @param array  $attributes Its attributes
-   *
-   * @return string
-   */
-  public function createIcon($iconType, $attributes = array());
+	/**
+	 * Render an icon
+	 *
+	 * @param string $icon       The icon name
+	 * @param array  $attributes Its attributes
+	 *
+	 * @return string
+	 */
+	public function createIcon($iconType, $attributes = array());
 
-  /**
-   * Wrap an item to be prepended or appended to the current field
-   *
-   * @param  string $item
-   *
-   * @return string A wrapped item
-   */
-  public function placeAround($item);
+	/**
+	 * Wrap an item to be prepended or appended to the current field
+	 *
+	 * @param  string $item
+	 *
+	 * @return string A wrapped item
+	 */
+	public function placeAround($item);
 
-  /**
-   * Wrap a field with prepended and appended items
-   *
-   * @param  Field $field
-   * @param  array $prepend
-   * @param  array $append
-   *
-   * @return string A field concatented with prepended and/or appended items
-   */
-  public function prependAppend($field, $prepend, $append);
+	/**
+	 * Wrap a field with prepended and appended items
+	 *
+	 * @param  Field $field
+	 * @param  array $prepend
+	 * @param  array $append
+	 *
+	 * @return string A field concatented with prepended and/or appended items
+	 */
+	public function prependAppend($field, $prepend, $append);
 
-  /**
-   * Wrap a field with potential additional tags
-   *
-   * @param  Field $field
-   *
-   * @return string A wrapped field
-   */
-  public function wrapField($field);
+	/**
+	 * Wrap a field with potential additional tags
+	 *
+	 * @param  Field $field
+	 *
+	 * @return string A wrapped field
+	 */
+	public function wrapField($field);
 }
diff --git a/src/Former/LiveValidation.php b/src/Former/LiveValidation.php
index 2feb341a..a27c48a7 100644
--- a/src/Former/LiveValidation.php
+++ b/src/Former/LiveValidation.php
@@ -9,335 +9,336 @@
  */
 class LiveValidation
 {
-  /**
-   * The field being worked on
-   *
-   * @var Field
-   */
-  public $field;
-
-  /**
-   * Load a Field instance to apply rules to it
-   *
-   * @param Field $field The field
-   * @param array $rules The rules to apply
-   */
-  public function __construct(Field &$field)
-  {
-    $this->field = $field;
-  }
-
-  /**
-   * Apply live validation rules to a field
-   *
-   * @param array $rules The rules to apply
-   */
-  public function apply($rules)
-  {
-    // If no rules to apply, cancel
-    if (!$rules) {
-      return false;
-    }
-
-    foreach ($rules as $rule => $parameters) {
-
-      // If the rule is unsupported yet, skip it
-      if (!method_exists($this, $rule)) {
-        continue;
-      }
-
-      $this->$rule($parameters);
-    }
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// RULES /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  // Field types
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Email field
-   */
-  public function email()
-  {
-    $this->field->setType('email');
-  }
-
-  /**
-   * URL field
-   */
-  public function url()
-  {
-    $this->field->setType('url');
-  }
-
-  /**
-   * Required field
-   */
-  public function required()
-  {
-    $this->field->required();
-  }
-
-  // Patterns
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Integer field
-   */
-  public function integer()
-  {
-    $this->field->pattern('\d+');
-  }
-
-  /**
-   * Numeric field
-   */
-  public function numeric()
-  {
-    if ($this->field->isOfType('number')) {
-      $this->field->step('any');
-    } else {
-      $this->field->pattern('[+-]?\d*\.?\d+');
-    }
-  }
-
-  /**
-   * Not numeric field
-   */
-  public function not_numeric()
-  {
-    $this->field->pattern('\D+');
-  }
-
-  /**
-   * Only alphanumerical
-   */
-  public function alpha()
-  {
-    $this->field->pattern('[a-zA-Z]+');
-  }
-
-  /**
-   * Only alphanumerical and numbers
-   */
-  public function alpha_num()
-  {
-    $this->field->pattern('[a-zA-Z0-9]+');
-  }
-
-  /**
-   * Alphanumerical, numbers and dashes
-   */
-  public function alpha_dash()
-  {
-    $this->field->pattern('[a-zA-Z0-9_\-]+');
-  }
-
-  /**
-   * In []
-   */
-  public function in($possible)
-  {
-    // Create the corresponding regex
-    $possible = (sizeof($possible) == 1) ? $possible[0] : '('.join('|', $possible).')';
-
-    $this->field->pattern('^' .$possible. '$');
-  }
-
-  /**
-   * Not in []
-   */
-  public function not_in($impossible)
-  {
-    $this->field->pattern('(?:(?!^' .join('$|^', $impossible). '$).)*');
-  }
-
-  /**
-   * Matches a pattern
-   */
-  public function match($pattern)
-  {
-    // Remove delimiters from existing regex
-    $pattern = substr($pattern[0], 1, -1);
-
-    $this->field->pattern($pattern);
-  }
-
-  /**
-   * Alias for match
-   */
-  public function regex($pattern)
-  {
-    return $this->match($pattern);
-  }
-
-  // Boundaries
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Max value
-   */
-  public function max($max)
-  {
-    if ($this->field->isOfType('file')) {
-      $this->size($max);
-    } else {
-      $this->setMax($max[0]);
-    }
-  }
-
-  /**
-   * Max size
-   */
-  public function size($size)
-  {
-    $this->field->max($size[0]);
-  }
-
-  /**
-   * Min value
-   */
-  public function min($min)
-  {
-    $this->setMin($min[0]);
-  }
-
-  /**
-   * Set boundaries
-   */
-  public function between($between)
-  {
-    list($min, $max) = $between;
-
-    $this->setBetween($min, $max);
-  }
-
-  /**
-   * Set accepted mime types
-   */
-  public function mimes($mimes)
-  {
-    // Only useful on file fields
-    if (!$this->field->isOfType('file')) {
-      return false;
-    }
-
-    $this->field->accept($this->setAccepted($mimes));
-  }
-
-  /**
-   * Set accept only images
-   */
-  public function image()
-  {
-    $this->mimes(array('jpg', 'png', 'gif', 'bmp'));
-  }
-
-  // Dates
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Before a date
-   */
-  public function before($date)
-  {
-    list($format, $date) = $this->formatDate($date[0]);
-
-    $this->field->max(date($format, $date));
-  }
-
-  /**
-   * After a date
-   */
-  public function after($date)
-  {
-    list($format, $date) = $this->formatDate($date[0]);
-
-    $this->field->min(date($format, $date));
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// HELPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Transform extensions and mime groups into a list of mime types
-   *
-   * @param  array  $mimes An array of mimes
-   * @return string A concatenated list of mimes
-   */
-  private function setAccepted($mimes)
-  {
-    // Transform extensions or mime groups into mime types
-    $mimes = array_map(array('\Laravel\File', 'mime'), $mimes);
-
-    return implode(',', $mimes);
-  }
-
-  /**
-   * Format a date to a pattern
-   *
-   * @param  string $date The date
-   * @return string The pattern
-   */
-  private function formatDate($date)
-  {
-    $format = 'Y-m-d';
-
-    // Add hour for datetime fields
-    if ($this->field->isOfType('datetime', 'datetime-local')) {
-      $format .= '\TH:i:s';
-    }
-
-    return array($format, strtotime($date));
-  }
-
-  /**
-   * Set a maximum value to a field
-   *
-   * @param integer $max
-   */
-  private function setMax($max)
-  {
-    $attribute = $this->field->isOfType('number') ? 'max' : 'maxlength';
-
-    $this->field->$attribute($max);
-  }
-
-  /**
-   * Set a minimum value to a field
-   *
-   * @param integer $min
-   */
-  private function setMin($min)
-  {
-    if ($this->field->isOfType('number') == 'min') {
-      $this->field->min($min);
-    } else {
-      $this->field->pattern(".{" . $min . ",}");
-    }
-  }
-
-  /**
-   * Set a minimum and maximum value to a field
-   *
-   * @param $min
-   * @param $max
-   */
-  public function setBetween($min, $max)
-  {
-    if ($this->field->isOfType('number') == 'min') {
-      // min, max values for generation of the pattern
-      $this->field->min($min);
-      $this->field->max($max);
-    } else {
-      $this->field->pattern('.{' . $min . ',' . $max . '}');
-
-      // still let the browser limit text input after reaching the max
-      $this->field->maxlength($max);
-    }
-  }
+	/**
+	 * The field being worked on
+	 *
+	 * @var Field
+	 */
+	public $field;
+
+	/**
+	 * Load a Field instance to apply rules to it
+	 *
+	 * @param Field $field The field
+	 */
+	public function __construct(Field &$field)
+	{
+		$this->field = $field;
+	}
+
+	/**
+	 * Apply live validation rules to a field
+	 *
+	 * @param array $rules The rules to apply
+	 */
+	public function apply($rules)
+	{
+		// If no rules to apply, cancel
+		if (!$rules) {
+			return false;
+		}
+
+		foreach ($rules as $rule => $parameters) {
+
+			// If the rule is unsupported yet, skip it
+			if (!method_exists($this, $rule)) {
+				continue;
+			}
+
+			$this->$rule($parameters);
+		}
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// RULES /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	// Field types
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Email field
+	 */
+	public function email()
+	{
+		$this->field->setType('email');
+	}
+
+	/**
+	 * URL field
+	 */
+	public function url()
+	{
+		$this->field->setType('url');
+	}
+
+	/**
+	 * Required field
+	 */
+	public function required()
+	{
+		$this->field->required();
+	}
+
+	// Patterns
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Integer field
+	 */
+	public function integer()
+	{
+		$this->field->pattern('\d+');
+	}
+
+	/**
+	 * Numeric field
+	 */
+	public function numeric()
+	{
+		if ($this->field->isOfType('number')) {
+			$this->field->step('any');
+		} else {
+			$this->field->pattern('[+-]?\d*\.?\d+');
+		}
+	}
+
+	/**
+	 * Not numeric field
+	 */
+	public function not_numeric()
+	{
+		$this->field->pattern('\D+');
+	}
+
+	/**
+	 * Only alphanumerical
+	 */
+	public function alpha()
+	{
+		$this->field->pattern('[a-zA-Z]+');
+	}
+
+	/**
+	 * Only alphanumerical and numbers
+	 */
+	public function alpha_num()
+	{
+		$this->field->pattern('[a-zA-Z0-9]+');
+	}
+
+	/**
+	 * Alphanumerical, numbers and dashes
+	 */
+	public function alpha_dash()
+	{
+		$this->field->pattern('[a-zA-Z0-9_\-]+');
+	}
+
+	/**
+	 * In []
+	 */
+	public function in($possible)
+	{
+		// Create the corresponding regex
+		$possible = (sizeof($possible) == 1) ? $possible[0] : '('.join('|', $possible).')';
+
+		$this->field->pattern('^'.$possible.'$');
+	}
+
+	/**
+	 * Not in []
+	 */
+	public function not_in($impossible)
+	{
+		$this->field->pattern('(?:(?!^'.join('$|^', $impossible).'$).)*');
+	}
+
+	/**
+	 * Matches a pattern
+	 */
+	public function match($pattern)
+	{
+		// Remove delimiters from existing regex
+		$pattern = substr($pattern[0], 1, -1);
+
+		$this->field->pattern($pattern);
+	}
+
+	/**
+	 * Alias for match
+	 */
+	public function regex($pattern)
+	{
+		return $this->match($pattern);
+	}
+
+	// Boundaries
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Max value
+	 */
+	public function max($max)
+	{
+		if ($this->field->isOfType('file')) {
+			$this->size($max);
+		} else {
+			$this->setMax($max[0]);
+		}
+	}
+
+	/**
+	 * Max size
+	 */
+	public function size($size)
+	{
+		$this->field->max($size[0]);
+	}
+
+	/**
+	 * Min value
+	 */
+	public function min($min)
+	{
+		$this->setMin($min[0]);
+	}
+
+	/**
+	 * Set boundaries
+	 */
+	public function between($between)
+	{
+		list($min, $max) = $between;
+
+		$this->setBetween($min, $max);
+	}
+
+	/**
+	 * Set accepted mime types
+	 */
+	public function mimes($mimes)
+	{
+		// Only useful on file fields
+		if (!$this->field->isOfType('file')) {
+			return false;
+		}
+
+		$this->field->accept($this->setAccepted($mimes));
+	}
+
+	/**
+	 * Set accept only images
+	 */
+	public function image()
+	{
+		$this->mimes(array('jpg', 'png', 'gif', 'bmp'));
+	}
+
+	// Dates
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Before a date
+	 */
+	public function before($date)
+	{
+		list($format, $date) = $this->formatDate($date[0]);
+
+		$this->field->max(date($format, $date));
+	}
+
+	/**
+	 * After a date
+	 */
+	public function after($date)
+	{
+		list($format, $date) = $this->formatDate($date[0]);
+
+		$this->field->min(date($format, $date));
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// HELPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Transform extensions and mime groups into a list of mime types
+	 *
+	 * @param  array $mimes An array of mimes
+	 *
+	 * @return string A concatenated list of mimes
+	 */
+	private function setAccepted($mimes)
+	{
+		// Transform extensions or mime groups into mime types
+		$mimes = array_map(array('\Laravel\File', 'mime'), $mimes);
+
+		return implode(',', $mimes);
+	}
+
+	/**
+	 * Format a date to a pattern
+	 *
+	 * @param  string $date The date
+	 *
+	 * @return string The pattern
+	 */
+	private function formatDate($date)
+	{
+		$format = 'Y-m-d';
+
+		// Add hour for datetime fields
+		if ($this->field->isOfType('datetime', 'datetime-local')) {
+			$format .= '\TH:i:s';
+		}
+
+		return array($format, strtotime($date));
+	}
+
+	/**
+	 * Set a maximum value to a field
+	 *
+	 * @param integer $max
+	 */
+	private function setMax($max)
+	{
+		$attribute = $this->field->isOfType('number') ? 'max' : 'maxlength';
+
+		$this->field->$attribute($max);
+	}
+
+	/**
+	 * Set a minimum value to a field
+	 *
+	 * @param integer $min
+	 */
+	private function setMin($min)
+	{
+		if ($this->field->isOfType('number') == 'min') {
+			$this->field->min($min);
+		} else {
+			$this->field->pattern(".{".$min.",}");
+		}
+	}
+
+	/**
+	 * Set a minimum and maximum value to a field
+	 *
+	 * @param $min
+	 * @param $max
+	 */
+	public function setBetween($min, $max)
+	{
+		if ($this->field->isOfType('number') == 'min') {
+			// min, max values for generation of the pattern
+			$this->field->min($min);
+			$this->field->max($max);
+		} else {
+			$this->field->pattern('.{'.$min.','.$max.'}');
+
+			// still let the browser limit text input after reaching the max
+			$this->field->maxlength($max);
+		}
+	}
 }
diff --git a/src/Former/MethodDispatcher.php b/src/Former/MethodDispatcher.php
index 6226a906..10212237 100644
--- a/src/Former/MethodDispatcher.php
+++ b/src/Former/MethodDispatcher.php
@@ -11,230 +11,233 @@
  */
 class MethodDispatcher
 {
-  /**
-   * The IoC Container
-   *
-   * @var Container
-   */
-  protected $app;
-
-  /**
-   * An array of fields repositories
-   *
-   * @var array
-   */
-  protected $repositories = array();
-
-  /**
-   * Build a new Dispatcher
-   *
-   * @param Container $app
-   */
-  public function __construct(Container $app, $repositories)
-  {
-    $this->app          = $app;
-    $this->repositories = (array) $repositories;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// REPOSITORIES /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Add a fields repository
-   *
-   * @param string $repository
-   */
-  public function addRepository($repository)
-  {
-    array_unshift($repository, $this->repositories);
-
-    return $this;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// DISPATCHERS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Dispatch a call to a registered macro
-   *
-   * @param  string $method       The macro's name
-   * @param  array  $parameters   The macro's arguments
-   *
-   * @return mixed
-   */
-  public function toMacros($method, $parameters)
-  {
-    if (!$this->app['former']->hasMacro($method)) {
-      return false;
-    }
-
-    // Get and format macro
-    $callback = $this->app['former']->getMacro($method);
-    if ($callback instanceof Closure) {
-      return call_user_func_array($callback, $parameters);
-    }
-
-    // Cancel if the macro is invalid
-    elseif (!is_string($callback)) {
-      return false;
-    }
-
-    // Get class and method
-    list($class, $method) = explode('@', $callback);
-    $this->app->instance('Illuminate\Container\Container', $this->app);
-
-    return call_user_func_array(array($this->app->make($class), $method), $parameters);
-  }
-
-  /**
-   * Dispatch a call over to Elements
-   *
-   * @param string    $method     The method called
-   * @param array     $parameters Its parameters
-   *
-   * @return string
-   */
-  public function toElements($method, $parameters)
-  {
-    // Disregards if the method isn't an element
-    if (!method_exists($elements = new Form\Elements($this->app, $this->app['session']), $method)) {
-      return false;
-    }
-
-    return call_user_func_array(array($elements, $method), $parameters);
-  }
-
-  /**
-   * Dispatch a call over to Form
-   *
-   * @param string  $method     The method called
-   * @param array   $parameters Its parameters
-   *
-   * @return Form
-   */
-  public function toForm($method, $parameters)
-  {
-    // Disregards if the method doesn't contain 'open'
-    if (!Str::contains($method, 'open') and !Str::contains($method, 'Open')) {
-      return false;
-    }
-
-    $form = new Form\Form($this->app, $this->app['url'], $this->app['former.populator']);
-
-    return $form->openForm($method, $parameters);
-  }
-
-  /**
-   * Dispatch a call over to Group
-   *
-   * @param string    $method     The method called
-   * @param array     $parameters Its parameters
-   *
-   * @return Group
-   */
-  public function toGroup($method, $parameters)
-  {
-    // Disregards if the method isn't "group"
-    if ($method != 'group') {
-      return false;
-    }
-
-    // Create opener
-    $group = new Form\Group(
-      $this->app,
-      array_get($parameters, 0, null),
-      array_get($parameters, 1, null)
-    );
-
-    // Set custom group as true
-    Form\Group::$opened = true;
-
-    return $group;
-  }
-
-  /**
-   * Dispatch a call over to Actions
-   *
-   * @param string    $method     The method called
-   * @param array     $parameters Its parameters
-   *
-   * @return Actions
-   */
-  public function toActions($method, $parameters)
-  {
-    if ($method != 'actions') {
-      return false;
-    }
-
-    return new Form\Actions($this->app, $parameters);
-  }
-
-  /**
-   * Dispatch a call over to the Fields
-   *
-   * @param string    $method     The method called
-   * @param array     $parameters Its parameters
-   *
-   * @return Field
-   */
-  public function toFields($method, $parameters)
-  {
-    // Listing parameters
-    $class = $this->getClassFromMethod($method);
-    $field = new $class(
-      $this->app,
-      $method,
-      array_get($parameters, 0),
-      array_get($parameters, 1),
-      array_get($parameters, 2),
-      array_get($parameters, 3),
-      array_get($parameters, 4),
-      array_get($parameters, 5)
-    );
-
-    return $field;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// HELPERS //////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Get the correct class to call according to the created field
-   *
-   * @param  string $method The field created
-   *
-   * @return string The correct class
-   */
-  protected function getClassFromMethod($method)
-  {
-    // If the field's name directly match a class, call it
-    $class = Str::singular(Str::title($method));
-    foreach ($this->repositories as $repository) {
-      if (class_exists($repository.$class)) {
-        return $repository.$class;
-      }
-    }
-
-    // Else convert known fields to their classes
-    switch ($method) {
-      case 'submit':
-      case 'link':
-      case 'reset':
-        $class = Former::FIELDSPACE.'Button';
-        break;
-
-      case 'multiselect':
-        $class = Former::FIELDSPACE.'Select';
-        break;
-
-      default:
-        $class = Former::FIELDSPACE.'Input';
-        break;
-    }
-
-    return $class;
-  }
+	/**
+	 * The IoC Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
+
+	/**
+	 * An array of fields repositories
+	 *
+	 * @var array
+	 */
+	protected $repositories = array();
+
+	/**
+	 * Build a new Dispatcher
+	 *
+	 * @param Container $app
+	 * @param array     $repositories
+	 */
+	public function __construct(Container $app, $repositories)
+	{
+		$this->app          = $app;
+		$this->repositories = (array) $repositories;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// REPOSITORIES /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Add a fields repository
+	 *
+	 * @param string $repository
+	 *
+	 * @return $this
+	 */
+	public function addRepository($repository)
+	{
+		array_unshift($repository, $this->repositories);
+
+		return $this;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// DISPATCHERS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Dispatch a call to a registered macro
+	 *
+	 * @param  string $method     The macro's name
+	 * @param  array  $parameters The macro's arguments
+	 *
+	 * @return mixed
+	 */
+	public function toMacros($method, $parameters)
+	{
+		if (!$this->app['former']->hasMacro($method)) {
+			return false;
+		}
+
+		// Get and format macro
+		$callback = $this->app['former']->getMacro($method);
+		if ($callback instanceof Closure) {
+			return call_user_func_array($callback, $parameters);
+		}
+
+		// Cancel if the macro is invalid
+		elseif (!is_string($callback)) {
+			return false;
+		}
+
+		// Get class and method
+		list($class, $method) = explode('@', $callback);
+		$this->app->instance('Illuminate\Container\Container', $this->app);
+
+		return call_user_func_array(array($this->app->make($class), $method), $parameters);
+	}
+
+	/**
+	 * Dispatch a call over to Elements
+	 *
+	 * @param string $method     The method called
+	 * @param array  $parameters Its parameters
+	 *
+	 * @return string
+	 */
+	public function toElements($method, $parameters)
+	{
+		// Disregards if the method isn't an element
+		if (!method_exists($elements = new Form\Elements($this->app, $this->app['session']), $method)) {
+			return false;
+		}
+
+		return call_user_func_array(array($elements, $method), $parameters);
+	}
+
+	/**
+	 * Dispatch a call over to Form
+	 *
+	 * @param string $method     The method called
+	 * @param array  $parameters Its parameters
+	 *
+	 * @return Form
+	 */
+	public function toForm($method, $parameters)
+	{
+		// Disregards if the method doesn't contain 'open'
+		if (!Str::contains($method, 'open') and !Str::contains($method, 'Open')) {
+			return false;
+		}
+
+		$form = new Form\Form($this->app, $this->app['url'], $this->app['former.populator']);
+
+		return $form->openForm($method, $parameters);
+	}
+
+	/**
+	 * Dispatch a call over to Group
+	 *
+	 * @param string $method     The method called
+	 * @param array  $parameters Its parameters
+	 *
+	 * @return Group
+	 */
+	public function toGroup($method, $parameters)
+	{
+		// Disregards if the method isn't "group"
+		if ($method != 'group') {
+			return false;
+		}
+
+		// Create opener
+		$group = new Form\Group(
+			$this->app,
+			array_get($parameters, 0, null),
+			array_get($parameters, 1, null)
+		);
+
+		// Set custom group as true
+		Form\Group::$opened = true;
+
+		return $group;
+	}
+
+	/**
+	 * Dispatch a call over to Actions
+	 *
+	 * @param string $method     The method called
+	 * @param array  $parameters Its parameters
+	 *
+	 * @return Actions
+	 */
+	public function toActions($method, $parameters)
+	{
+		if ($method != 'actions') {
+			return false;
+		}
+
+		return new Form\Actions($this->app, $parameters);
+	}
+
+	/**
+	 * Dispatch a call over to the Fields
+	 *
+	 * @param string $method     The method called
+	 * @param array  $parameters Its parameters
+	 *
+	 * @return Field
+	 */
+	public function toFields($method, $parameters)
+	{
+		// Listing parameters
+		$class = $this->getClassFromMethod($method);
+		$field = new $class(
+			$this->app,
+			$method,
+			array_get($parameters, 0),
+			array_get($parameters, 1),
+			array_get($parameters, 2),
+			array_get($parameters, 3),
+			array_get($parameters, 4),
+			array_get($parameters, 5)
+		);
+
+		return $field;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// HELPERS //////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Get the correct class to call according to the created field
+	 *
+	 * @param  string $method The field created
+	 *
+	 * @return string The correct class
+	 */
+	protected function getClassFromMethod($method)
+	{
+		// If the field's name directly match a class, call it
+		$class = Str::singular(Str::title($method));
+		foreach ($this->repositories as $repository) {
+			if (class_exists($repository.$class)) {
+				return $repository.$class;
+			}
+		}
+
+		// Else convert known fields to their classes
+		switch ($method) {
+			case 'submit':
+			case 'link':
+			case 'reset':
+				$class = Former::FIELDSPACE.'Button';
+				break;
+
+			case 'multiselect':
+				$class = Former::FIELDSPACE.'Select';
+				break;
+
+			default:
+				$class = Former::FIELDSPACE.'Input';
+				break;
+		}
+
+		return $class;
+	}
 }
diff --git a/src/Former/Populator.php b/src/Former/Populator.php
index e92e64c1..751dbcbf 100644
--- a/src/Former/Populator.php
+++ b/src/Former/Populator.php
@@ -1,9 +1,9 @@
 <?php
 namespace Former;
 
-use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 /**
  * Populates the class with values, and fetches them
@@ -11,155 +11,155 @@
  */
 class Populator extends Collection
 {
-  /**
-   * Create a new collection.
-   *
-   * @param  array|Model  $items
-   * @return void
-   */
-  public function __construct($items = array())
-  {
-    $this->items = $items;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////// INDIVIDUAL VALUES ////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Get the value of a field
-   *
-   * @param string $field The field's name
-   *
-   * @return mixed
-   */
-  public function get($field, $fallback = null)
-  {
-    // Anonymous fields should not return any value
-    if ($field == null) {
-      return null;
-    }
-    
-    // Plain array
-    if (is_array($this->items) and !str_contains($field, '[')) {
-      return parent::get($field, $fallback);
-    }
-
-    // Transform the name into an array
-    $value = $this->items;
-    $field = $this->parseFieldAsArray($field);
-
-    // Dive into the model
-    foreach ($field as $relationship) {
-
-      // Get attribute from model
-      if (!is_array($value)) {
-        $value = $this->getAttributeFromModel($value, $relationship, $fallback);
-        if ($value === $fallback) {
-          break;
-        }
-
-        continue;
-      }
-
-      // Get attribute from model
-      if (array_key_exists($relationship, $value)) {
-        $value = $value[$relationship];
-      } else {
-        foreach ($value as $key => $submodel) {
-          $value[$key] = $this->getAttributeFromModel($submodel, $relationship, $fallback);
-        }
-      }
-
-    }
-
-    return $value;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// SWAPPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Replace the items
-   *
-   * @param  mixed $items
-   *
-   * @return void
-   */
-  public function replace($items)
-  {
-    $this->items = $items;
-  }
-
-  /**
-   * Reset the current values array
-   *
-   * @return void
-   */
-  public function reset()
-  {
-    $this->items = array();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// HELPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Parses the name of a field to a tree of fields
-   *
-   * @param string $field The field's name
-   *
-   * @return array A tree of field
-   */
-  protected function parseFieldAsArray($field)
-  {
-    if (Str::contains($field, '[]')) {
-      return (array) $field;
-    }
-
-    // Transform array notation to dot notation
-    if (Str::contains($field, '[')) {
-      $field = preg_replace("/[\[\]]/", '.', $field);
-      $field = str_replace('..', '.', $field);
-      $field = trim($field, '.');
-    }
-
-    // Parse dot notation
-    if (Str::contains($field, '.')) {
-      $field = explode('.', $field);
-    } else {
-      $field = (array) $field;
-    }
-
-    return $field;
-  }
-
-  /**
-   * Get an attribute from a model
-   *
-   * @param object $model     The model
-   * @param string $attribute The attribute's name
-   * @param string $fallback  Fallback value
-   *
-   * @return mixed
-   */
-  public function getAttributeFromModel($model, $attribute, $fallback)
-  {
-    if ($model instanceof Model) {
-      return $model->getAttribute($attribute);
-    }
-
-    if (method_exists($model, 'toArray')) {
-      $model = $model->toArray();
-    } else {
-      $model = (array) $model;
-    }
-    if (array_key_exists($attribute, $model)) {
-      return $model[$attribute];
-    }
-
-    return $fallback;
-  }
+	/**
+	 * Create a new collection.
+	 *
+	 * @param  array|Model $items
+	 *
+	 * @return void
+	 */
+	public function __construct($items = array())
+	{
+		$this->items = $items;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////// INDIVIDUAL VALUES ////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Get the value of a field
+	 *
+	 * @param string $field The field's name
+	 *
+	 * @return mixed
+	 */
+	public function get($field, $fallback = null)
+	{
+		// Anonymous fields should not return any value
+		if ($field == null) {
+			return null;
+		}
+
+		// Plain array
+		if (is_array($this->items) and !str_contains($field, '[')) {
+			return parent::get($field, $fallback);
+		}
+
+		// Transform the name into an array
+		$value = $this->items;
+		$field = $this->parseFieldAsArray($field);
+
+		// Dive into the model
+		foreach ($field as $relationship) {
+
+			// Get attribute from model
+			if (!is_array($value)) {
+				$value = $this->getAttributeFromModel($value, $relationship, $fallback);
+				if ($value === $fallback) {
+					break;
+				}
+
+				continue;
+			}
+
+			// Get attribute from model
+			if (array_key_exists($relationship, $value)) {
+				$value = $value[$relationship];
+			} else {
+				foreach ($value as $key => $submodel) {
+					$value[$key] = $this->getAttributeFromModel($submodel, $relationship, $fallback);
+				}
+			}
+		}
+
+		return $value;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// SWAPPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Replace the items
+	 *
+	 * @param  mixed $items
+	 *
+	 * @return void
+	 */
+	public function replace($items)
+	{
+		$this->items = $items;
+	}
+
+	/**
+	 * Reset the current values array
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->items = array();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// HELPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Parses the name of a field to a tree of fields
+	 *
+	 * @param string $field The field's name
+	 *
+	 * @return array A tree of field
+	 */
+	protected function parseFieldAsArray($field)
+	{
+		if (Str::contains($field, '[]')) {
+			return (array) $field;
+		}
+
+		// Transform array notation to dot notation
+		if (Str::contains($field, '[')) {
+			$field = preg_replace("/[\[\]]/", '.', $field);
+			$field = str_replace('..', '.', $field);
+			$field = trim($field, '.');
+		}
+
+		// Parse dot notation
+		if (Str::contains($field, '.')) {
+			$field = explode('.', $field);
+		} else {
+			$field = (array) $field;
+		}
+
+		return $field;
+	}
+
+	/**
+	 * Get an attribute from a model
+	 *
+	 * @param object $model     The model
+	 * @param string $attribute The attribute's name
+	 * @param string $fallback  Fallback value
+	 *
+	 * @return mixed
+	 */
+	public function getAttributeFromModel($model, $attribute, $fallback)
+	{
+		if ($model instanceof Model) {
+			return $model->getAttribute($attribute);
+		}
+
+		if (method_exists($model, 'toArray')) {
+			$model = $model->toArray();
+		} else {
+			$model = (array) $model;
+		}
+		if (array_key_exists($attribute, $model)) {
+			return $model[$attribute];
+		}
+
+		return $fallback;
+	}
 }
diff --git a/src/Former/Traits/Checkable.php b/src/Former/Traits/Checkable.php
index f5749c7f..d7908a95 100644
--- a/src/Former/Traits/Checkable.php
+++ b/src/Former/Traits/Checkable.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Traits;
 
-use Former\Former;
 use Former\Helpers;
 use HtmlObject\Element;
 use HtmlObject\Input;
@@ -12,473 +11,507 @@
  */
 abstract class Checkable extends Field
 {
-  /**
-   * Renders the checkables as inline
-   *
-   * @var boolean
-   */
-  protected $inline = false;
-
-  /**
-   * Add a text to a single element
-   *
-   * @var string
-   */
-  protected $text = null;
-
-   /**
-   * Renders the checkables as grouped
-   *
-   * @var boolean
-   */
-  protected $grouped = false;
-
-  /**
-   * The checkable items currently stored
-   *
-   * @var array
-   */
-  protected $items = array();
-
-  /**
-   * The type of checkable item
-   *
-   * @var string
-   */
-  protected $checkable = null;
-
-  /**
-   * An array of checked items
-   *
-   * @var array
-   */
-  protected $checked = array();
-
-  /**
-   * The checkable currently being focused on
-   *
-   * @var integer
-   */
-  protected $focus = null;
-
-  /**
-   * Whether this particular checkable is to be pushed
-   *
-   * @var boolean
-   */
-  protected $isPushed = null;
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// CORE METHODS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Build a new checkable
-   */
-  public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-  {
-    // Unify auto and chained methods of grouping checkboxes
-    if (ends_with($name,'[]')) {
-      $name = substr($name, 0, -2);
-      $this->grouped();
-    }
-    parent::__construct($app, $type, $name, $label, $value, $attributes);
-
-    if (is_array($this->value)) {
-      $this->items($this->value);
-    }
-  }
-
-  /**
-   * Apply methods to focused checkable
-   */
-  public function __call($method, $parameters)
-  {
-    $focused = $this->setOnFocused('attributes.'.$method, array_get($parameters, 0));
-    if ($focused) return $this;
-    return parent::__call($method, $parameters);
-  }
-
-  /**
-   * Prints out the currently stored checkables
-   */
-  public function render()
-  {
-    $html = null;
-
-    // Multiple items
-    if ($this->items) {
-      unset($this->app['former']->labels[array_search($this->name, $this->app['former']->labels)]);
-      foreach ($this->items as $key => $item) {
-        $value = $this->isCheckbox() && !$this->isGrouped() ? 1 : $key;
-        $html .= $this->createCheckable($item, $value);
-      }
-
-      return $html;
-    }
-
-    // Single item
-    return $this->createCheckable(array(
-      'name'  => $this->name,
-      'label' => $this->text,
-      'value' => $this->value
-    ));
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// FIELD METHODS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Focus on a particular checkable
-   *
-   * @param integer $on The checkable to focus on
-   */
-  public function on($on)
-  {
-    if (!isset($this->items[$on])) return $this;
-    else $this->focus = $on;
-    return $this;
-  }
-
-  /**
-   * Set the checkables as inline
-   */
-  public function inline()
-  {
-    $this->inline = true;
-
-    return $this;
-  }
-
-  /**
-   * Set the checkables as stacked
-   */
-  public function stacked()
-  {
-    $this->inline = false;
-
-    return $this;
-  }
-
-  /**
-   * Set the checkables as grouped
-   */
-  public function grouped()
-  {
-    $this->grouped = true;
-
-    return $this;
-  }
-
-  /**
-   * Add text to a single checkable
-   *
-   * @param  string $text The checkable label
-   */
-  public function text($text)
-  {
-    // Translate and format
-    $text = Helpers::translate($text);
-
-    // Apply on focused if any
-    $focused = $this->setOnFocused('label', $text);
-    if ($focused) return $this;
-
-    $this->text = $text;
-
-    return $this;
-  }
-
-  /**
-   * Push this particular checkbox
-   *
-   * @param boolean $pushed
-   */
-  public function push($pushed = true)
-  {
-    $this->isPushed = $pushed;
-
-    return $this;
-  }
-
-  /**
-   * Check a specific item
-   *
-   * @param  string $checked The checkable to check, or an array of checked items
-   */
-  public function check($checked = true)
-  {
-    // If we're setting all the checked items at once
-    if (is_array($checked)) {
-      $this->checked = $checked;
-
-    // Checking an item in particular
-    } elseif (is_string($checked) or is_int($checked)) {
-      $this->checked[$checked] = true;
-
-    // Only setting a single item
-    } else {
-      $this->checked[$this->name] = (bool) $checked;
-    }
-
-    return $this;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// INTERNAL METHODS ////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Creates a serie of checkable items
-   *
-   * @param array $_items Items to create
-   */
-  protected function items($_items)
-  {
-    // If passing an array
-    if (sizeof($_items) == 1 and
-       isset($_items[0]) and
-       is_array($_items[0])) {
-         $_items = $_items[0];
-    }
-
-    // Fetch models if that's what we were passed
-    if (isset($_items[0]) and is_object($_items[0])) {
-      $_items = Helpers::queryToArray($_items);
-      $_items = array_flip($_items);
-    }
-
-    // Iterate through items, assign a name and a label to each
-    $count = 0;
-    foreach ($_items as $label => $name) {
-
-      // Define a fallback name in case none is found
-      $fallback = $this->isCheckbox()
-        ? $this->name.'_'.$count
-        : $this->name;
-
-      // Grouped fields
-      if ($this->isGrouped()) {
-        $attributes['id'] = str_replace('[]', null, $fallback);
-        $fallback = str_replace('[]', null, $this->name).'[]';
-      }
-
-      // If we haven't any name defined for the checkable, try to compute some
-      if (!is_string($label) and !is_array($name)) {
-        $label = $name;
-        $name  = $fallback;
-      }
-
-      // If we gave custom information on the item, add them
-      if (is_array($name)) {
-        $attributes = $name;
-        $name = array_get($attributes, 'name', $fallback);
-        unset($attributes['name']);
-      }
-
-      // Store all informations we have in an array
-      $item = array(
-        'name' => $name,
-        'label' => Helpers::translate($label),
-        'count' => $count,
-      );
-      if (isset($attributes)) {
-        $item['attributes'] = $attributes;
-      }
-
-      $this->items[] = $item;
-      $count++;
-    }
-  }
-
-  /**
-   * Renders a checkable
-   *
-   * @param  string|array $item          A checkable item
-   * @param  string       $fallbackValue A fallback value if none is set
-   * @return string
-   */
-  protected function createCheckable($item, $fallbackValue = 1)
-  {
-    // Extract informations
-    extract($item);
-
-    // Set default values
-    if (!isset($attributes)) {
-      $attributes = array();
-    }
-    if (isset($attributes['value'])) {
-      $value = $attributes['value'];
-    }
-    if (!isset($value) or $value === $this->app['former']->getOption('unchecked_value')) {
-      $value = $fallbackValue;
-    }
-
-    // If inline items, add class
-    $isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : null;
-
-    // Merge custom attributes with global attributes
-    $attributes = array_merge($this->attributes, $attributes);
-    if (!isset($attributes['id'])) {
-      $attributes['id'] = $name.$this->unique($name);
-    }
-
-    // Create field
-    $field = Input::create($this->checkable, $name, $value, $attributes);
-    if ($this->isChecked($item, $value)) {
-      $field->checked('checked');
-    }
-
-    // Add hidden checkbox if requested
-    if ($this->isOfType('checkbox', 'checkboxes')) {
-      if ($this->isPushed or ($this->app['former']->getOption('push_checkboxes') and $this->isPushed !== false)) {
-        $field = $this->app['former']->hidden($name)->forceValue($this->app['former']->getOption('unchecked_value')) . $field->render();
-      }
-    }
-
-    // If no label to wrap, return plain checkable
-    if (!$label) {
-      return (is_object($field)) ? $field->render() : $field;
-    }
-
-    return Element::create('label', $field.$label)->for($attributes['id'])->class($this->checkable.$isInline);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// HELPERS //////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Generate an unique ID for a field
-   *
-   * @param string $name The field's name
-   * @return string A field number to use
-   */
-  protected function unique($name)
-  {
-    $this->app['former']->labels[] = $name;
-
-    // Count number of fields with the same ID
-    $where = array_filter($this->app['former']->labels, function ($label) use ($name) {
-      return $label == $name;
-    });
-    $unique = sizeof($where);
-
-    // In case the field doesn't need to be numbered
-    if ($unique < 2 or empty($this->items)) {
-      return false;
-    }
-
-    return $unique;
-  }
-
-  /**
-   * Set something on the currently focused checkable
-   *
-   * @param string $attribute The key to set
-   * @param string $value     Its value
-   */
-  protected function setOnFocused($attribute, $value)
-  {
-    if (is_null($this->focus)) {
-      return false;
-    }
-
-    $this->items[$this->focus] = array_set($this->items[$this->focus], $attribute, $value);
-
-    return $this;
-  }
-
-  /**
-   * Check if a checkable is checked
-   *
-   * @return boolean Checked or not
-   */
-  protected function isChecked($item = null, $value = null)
-  {
-    if (isset($item['name'])) {
-      $name = $item['name'];
-    }
-    if (empty($name)) {
-      $name = $this->name;
-    }
-
-    // If it's a checkbox, see if we marqued that one as checked in the array
-    // Or if it's a single radio, simply see if we called check
-    if ($this->isCheckbox() or
-      !$this->isCheckbox() and !$this->items) {
-        $checked = array_get($this->checked, $name, false);
-
-    // If there are multiple, search for the value
-    // as the name are the same between radios
-    } else {
-      $checked = array_get($this->checked, $value, false);
-    }
-
-    // Check the values and POST array
-    if ($this->isGrouped()) {
-      $groupIndex = self::getGroupIndexFromItem($item);
-
-      // Search using the bare name, not the individual item name
-      $post   = $this->app['former']->getPost($this->name);
-      $static = $this->app['former']->getValue($this->name);
-
-      if (isset($post[$groupIndex])) {
-        $post = $post[$groupIndex];
-      }
-      if (isset($static[$groupIndex])) {
-        $static = $static[$groupIndex];
-      }
-
-    } else {
-      $post   = $this->app['former']->getPost($name);
-      $static = $this->app['former']->getValue($name);
-    }
-
-    if (!is_null($post) and $post !== $this->app['former']->getOption('unchecked_value')) {
-      $isChecked = ($post == $value);
-    } elseif (!is_null($static)) {
-      $isChecked = ($static == $value);
-    } else {
-      $isChecked = $checked;
-    }
-
-    return $isChecked ? true : false;
-  }
-
-  /**
-   * Check if the current element is a checkbox
-   *
-   * @return boolean Checkbox or radio
-   */
-  protected function isCheckbox()
-  {
-    return $this->checkable == 'checkbox';
-  }
-
-  /**
-   * Check if the checkables are grouped or not
-   *
-   * @return boolean
-   */
-  protected function isGrouped()
-  {
-    return
-      $this->grouped == true or
-      strpos($this->name, '[]') !== false;
-  }
-
-  /**
-   * @param array $item The item array, containing at least name and count keys.
-   * @return mixed The group index. (e.g. returns bar if the item name is foo[bar], or the item count for foo[])
-   */
-  public static function getGroupIndexFromItem($item)
-  {
-    $groupIndex = preg_replace('/^.*?\[(.*)\]$/', '$1', $item['name']);
-    if (empty($groupIndex) or $groupIndex == $item['name']) {
-      return $item['count'];
-    }
-    return $groupIndex;
-  }
+	/**
+	 * Renders the checkables as inline
+	 *
+	 * @var boolean
+	 */
+	protected $inline = false;
+
+	/**
+	 * Add a text to a single element
+	 *
+	 * @var string
+	 */
+	protected $text = null;
+
+	/**
+	 * Renders the checkables as grouped
+	 *
+	 * @var boolean
+	 */
+	protected $grouped = false;
+
+	/**
+	 * The checkable items currently stored
+	 *
+	 * @var array
+	 */
+	protected $items = array();
+
+	/**
+	 * The type of checkable item
+	 *
+	 * @var string
+	 */
+	protected $checkable = null;
+
+	/**
+	 * An array of checked items
+	 *
+	 * @var array
+	 */
+	protected $checked = array();
+
+	/**
+	 * The checkable currently being focused on
+	 *
+	 * @var integer
+	 */
+	protected $focus = null;
+
+	/**
+	 * Whether this particular checkable is to be pushed
+	 *
+	 * @var boolean
+	 */
+	protected $isPushed = null;
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// CORE METHODS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Build a new checkable
+	 *
+	 * @param Container $app
+	 * @param string    $type
+	 * @param array     $name
+	 * @param           $label
+	 * @param           $value
+	 * @param           $attributes
+	 */
+	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+	{
+		// Unify auto and chained methods of grouping checkboxes
+		if (ends_with($name, '[]')) {
+			$name = substr($name, 0, -2);
+			$this->grouped();
+		}
+		parent::__construct($app, $type, $name, $label, $value, $attributes);
+
+		if (is_array($this->value)) {
+			$this->items($this->value);
+		}
+	}
+
+	/**
+	 * Apply methods to focused checkable
+	 *
+	 * @param string $method
+	 * @param array  $parameters
+	 *
+	 * @return $this
+	 */
+	public function __call($method, $parameters)
+	{
+		$focused = $this->setOnFocused('attributes.'.$method, array_get($parameters, 0));
+		if ($focused) {
+			return $this;
+		}
+
+		return parent::__call($method, $parameters);
+	}
+
+	/**
+	 * Prints out the currently stored checkables
+	 */
+	public function render()
+	{
+		$html = null;
+
+		// Multiple items
+		if ($this->items) {
+			unset($this->app['former']->labels[array_search($this->name, $this->app['former']->labels)]);
+			foreach ($this->items as $key => $item) {
+				$value = $this->isCheckbox() && !$this->isGrouped() ? 1 : $key;
+				$html .= $this->createCheckable($item, $value);
+			}
+
+			return $html;
+		}
+
+		// Single item
+		return $this->createCheckable(array(
+			'name'  => $this->name,
+			'label' => $this->text,
+			'value' => $this->value
+		));
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// FIELD METHODS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Focus on a particular checkable
+	 *
+	 * @param integer $on The checkable to focus on
+	 *
+	 * @return $this
+	 */
+	public function on($on)
+	{
+		if (!isset($this->items[$on])) {
+			return $this;
+		} else {
+			$this->focus = $on;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the checkables as inline
+	 */
+	public function inline()
+	{
+		$this->inline = true;
+
+		return $this;
+	}
+
+	/**
+	 * Set the checkables as stacked
+	 */
+	public function stacked()
+	{
+		$this->inline = false;
+
+		return $this;
+	}
+
+	/**
+	 * Set the checkables as grouped
+	 */
+	public function grouped()
+	{
+		$this->grouped = true;
+
+		return $this;
+	}
+
+	/**
+	 * Add text to a single checkable
+	 *
+	 * @param  string $text The checkable label
+	 *
+	 * @return $this
+	 */
+	public function text($text)
+	{
+		// Translate and format
+		$text = Helpers::translate($text);
+
+		// Apply on focused if any
+		$focused = $this->setOnFocused('label', $text);
+		if ($focused) {
+			return $this;
+		}
+
+		$this->text = $text;
+
+		return $this;
+	}
+
+	/**
+	 * Push this particular checkbox
+	 *
+	 * @param boolean $pushed
+	 *
+	 * @return $this
+	 */
+	public function push($pushed = true)
+	{
+		$this->isPushed = $pushed;
+
+		return $this;
+	}
+
+	/**
+	 * Check a specific item
+	 *
+	 * @param bool|string $checked The checkable to check, or an array of checked items
+	 *
+	 * @return $this
+	 */
+	public function check($checked = true)
+	{
+		// If we're setting all the checked items at once
+		if (is_array($checked)) {
+			$this->checked = $checked;
+			// Checking an item in particular
+		} elseif (is_string($checked) or is_int($checked)) {
+			$this->checked[$checked] = true;
+			// Only setting a single item
+		} else {
+			$this->checked[$this->name] = (bool) $checked;
+		}
+
+		return $this;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// INTERNAL METHODS ////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Creates a serie of checkable items
+	 *
+	 * @param array $_items Items to create
+	 */
+	protected function items($_items)
+	{
+		// If passing an array
+		if (sizeof($_items) == 1 and
+			isset($_items[0]) and
+			is_array($_items[0])
+		) {
+			$_items = $_items[0];
+		}
+
+		// Fetch models if that's what we were passed
+		if (isset($_items[0]) and is_object($_items[0])) {
+			$_items = Helpers::queryToArray($_items);
+			$_items = array_flip($_items);
+		}
+
+		// Iterate through items, assign a name and a label to each
+		$count = 0;
+		foreach ($_items as $label => $name) {
+
+			// Define a fallback name in case none is found
+			$fallback = $this->isCheckbox()
+				? $this->name.'_'.$count
+				: $this->name;
+
+			// Grouped fields
+			if ($this->isGrouped()) {
+				$attributes['id'] = str_replace('[]', null, $fallback);
+				$fallback         = str_replace('[]', null, $this->name).'[]';
+			}
+
+			// If we haven't any name defined for the checkable, try to compute some
+			if (!is_string($label) and !is_array($name)) {
+				$label = $name;
+				$name  = $fallback;
+			}
+
+			// If we gave custom information on the item, add them
+			if (is_array($name)) {
+				$attributes = $name;
+				$name       = array_get($attributes, 'name', $fallback);
+				unset($attributes['name']);
+			}
+
+			// Store all informations we have in an array
+			$item = array(
+				'name'  => $name,
+				'label' => Helpers::translate($label),
+				'count' => $count,
+			);
+			if (isset($attributes)) {
+				$item['attributes'] = $attributes;
+			}
+
+			$this->items[] = $item;
+			$count++;
+		}
+	}
+
+	/**
+	 * Renders a checkable
+	 *
+	 * @param string|array $item          A checkable item
+	 * @param int|string   $fallbackValue A fallback value if none is set
+	 *
+	 * @return string
+	 */
+	protected function createCheckable($item, $fallbackValue = 1)
+	{
+		// Extract informations
+		extract($item);
+
+		// Set default values
+		if (!isset($attributes)) {
+			$attributes = array();
+		}
+		if (isset($attributes['value'])) {
+			$value = $attributes['value'];
+		}
+		if (!isset($value) or $value === $this->app['former']->getOption('unchecked_value')) {
+			$value = $fallbackValue;
+		}
+
+		// If inline items, add class
+		$isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : null;
+
+		// Merge custom attributes with global attributes
+		$attributes = array_merge($this->attributes, $attributes);
+		if (!isset($attributes['id'])) {
+			$attributes['id'] = $name.$this->unique($name);
+		}
+
+		// Create field
+		$field = Input::create($this->checkable, $name, $value, $attributes);
+		if ($this->isChecked($item, $value)) {
+			$field->checked('checked');
+		}
+
+		// Add hidden checkbox if requested
+		if ($this->isOfType('checkbox', 'checkboxes')) {
+			if ($this->isPushed or ($this->app['former']->getOption('push_checkboxes') and $this->isPushed !== false)) {
+				$field = $this->app['former']->hidden($name)->forceValue($this->app['former']->getOption('unchecked_value')).$field->render();
+			}
+		}
+
+		// If no label to wrap, return plain checkable
+		if (!$label) {
+			return (is_object($field)) ? $field->render() : $field;
+		}
+
+		return Element::create('label', $field.$label)->for($attributes['id'])->class($this->checkable.$isInline);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// HELPERS //////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Generate an unique ID for a field
+	 *
+	 * @param string $name The field's name
+	 *
+	 * @return string A field number to use
+	 */
+	protected function unique($name)
+	{
+		$this->app['former']->labels[] = $name;
+
+		// Count number of fields with the same ID
+		$where  = array_filter($this->app['former']->labels, function ($label) use ($name) {
+			return $label == $name;
+		});
+		$unique = sizeof($where);
+
+		// In case the field doesn't need to be numbered
+		if ($unique < 2 or empty($this->items)) {
+			return false;
+		}
+
+		return $unique;
+	}
+
+	/**
+	 * Set something on the currently focused checkable
+	 *
+	 * @param string $attribute The key to set
+	 * @param string $value     Its value
+	 *
+	 * @return $this|bool
+	 */
+	protected function setOnFocused($attribute, $value)
+	{
+		if (is_null($this->focus)) {
+			return false;
+		}
+
+		$this->items[$this->focus] = array_set($this->items[$this->focus], $attribute, $value);
+
+		return $this;
+	}
+
+	/**
+	 * Check if a checkable is checked
+	 *
+	 * @return boolean Checked or not
+	 */
+	protected function isChecked($item = null, $value = null)
+	{
+		if (isset($item['name'])) {
+			$name = $item['name'];
+		}
+		if (empty($name)) {
+			$name = $this->name;
+		}
+
+		// If it's a checkbox, see if we marqued that one as checked in the array
+		// Or if it's a single radio, simply see if we called check
+		if ($this->isCheckbox() or
+			!$this->isCheckbox() and !$this->items
+		) {
+			$checked = array_get($this->checked, $name, false);
+
+			// If there are multiple, search for the value
+			// as the name are the same between radios
+		} else {
+			$checked = array_get($this->checked, $value, false);
+		}
+
+		// Check the values and POST array
+		if ($this->isGrouped()) {
+			$groupIndex = self::getGroupIndexFromItem($item);
+
+			// Search using the bare name, not the individual item name
+			$post   = $this->app['former']->getPost($this->name);
+			$static = $this->app['former']->getValue($this->name);
+
+			if (isset($post[$groupIndex])) {
+				$post = $post[$groupIndex];
+			}
+			if (isset($static[$groupIndex])) {
+				$static = $static[$groupIndex];
+			}
+		} else {
+			$post   = $this->app['former']->getPost($name);
+			$static = $this->app['former']->getValue($name);
+		}
+
+		if (!is_null($post) and $post !== $this->app['former']->getOption('unchecked_value')) {
+			$isChecked = ($post == $value);
+		} elseif (!is_null($static)) {
+			$isChecked = ($static == $value);
+		} else {
+			$isChecked = $checked;
+		}
+
+		return $isChecked ? true : false;
+	}
+
+	/**
+	 * Check if the current element is a checkbox
+	 *
+	 * @return boolean Checkbox or radio
+	 */
+	protected function isCheckbox()
+	{
+		return $this->checkable == 'checkbox';
+	}
+
+	/**
+	 * Check if the checkables are grouped or not
+	 *
+	 * @return boolean
+	 */
+	protected function isGrouped()
+	{
+		return
+			$this->grouped == true or
+			strpos($this->name, '[]') !== false;
+	}
+
+	/**
+	 * @param array $item The item array, containing at least name and count keys.
+	 *
+	 * @return mixed The group index. (e.g. returns bar if the item name is foo[bar], or the item count for foo[])
+	 */
+	public static function getGroupIndexFromItem($item)
+	{
+		$groupIndex = preg_replace('/^.*?\[(.*)\]$/', '$1', $item['name']);
+		if (empty($groupIndex) or $groupIndex == $item['name']) {
+			return $item['count'];
+		}
+
+		return $groupIndex;
+	}
 }
diff --git a/src/Former/Traits/Field.php b/src/Former/Traits/Field.php
index a04f6e9a..108c1d6d 100644
--- a/src/Former/Traits/Field.php
+++ b/src/Former/Traits/Field.php
@@ -16,369 +16,369 @@
  */
 abstract class Field extends FormerObject implements FieldInterface
 {
-  /**
-   * The IoC Container
-   *
-   * @var Container
-   */
-  protected $app;
-
-  /**
-   * The Form instance
-   *
-   * @var Former\Form
-   */
-  protected $form;
-
-  /**
-   * A label for the field (if not using Bootstrap)
-   *
-   * @var string
-   */
-  protected $label;
-
-  /**
-   * The field's group
-   *
-   * @var Group
-   */
-  protected $group;
-
-  /**
-   * The field's default element
-   *
-   * @var string
-   */
-  protected $element = 'input';
-
-  /**
-   * Whether the Field is self-closing or not
-   *
-   * @var boolean
-   */
-  protected $isSelfClosing = true;
-
-  /**
-   * Get the current framework instance
-   *
-   * @return Framework
-   */
-  protected function currentFramework()
-  {
-    if ($this->app->bound('former.form.framework')) {
-      return $this->app['former.form.framework'];
-    }
-
-    return $this->app['former.framework'];
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// INTERFACE ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Set up a Field instance
-   *
-   * @param string $type A field type
-   */
-  public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-  {
-    // Set base parameters
-    $this->app   = $app;
-    $this->type  = $type;
-    $this->value = $value;
-    $this->setAttributes($attributes);
-    $this->form  = $this->app->bound('former.form') ? $this->app['former.form'] : null;
-
-    // Compute and translate label
-    $this->automaticLabels($name, $label);
-
-    // Repopulate field
-    if ($type != 'password') {
-      $this->value = $this->repopulate();
-    }
-
-    // Apply Live validation rules
-    if ($this->app['former']->getOption('live_validation')) {
-      $rules = new LiveValidation($this);
-      $rules->apply($this->getRules());
-    }
-
-    // Bind the Group class
-    $groupClass = $this->isCheckable() ? 'CheckableGroup' : 'Group';
-    $groupClass = Former::FORMSPACE.$groupClass;
-
-    $this->group = new $groupClass($this->app, $this->label);
-  }
-
-  /**
-   * Redirect calls to the group if necessary
-   */
-  public function __call($method, $parameters)
-  {
-    // Translate attributes
-    $translatable = $this->app['former']->getOption('translatable', array());
-    if (in_array($method, $translatable) and isset($parameters[0])) {
-      $parameters[0] = Helpers::translate($parameters[0]);
-    }
-
-    // Redirect calls to the Control Group
-    if (method_exists($this->group, $method) or Str::startsWith($method, 'onGroup')) {
-      $method = str_replace('onGroup', '', $method);
-      $method = lcfirst($method);
-
-      call_user_func_array(array($this->group, $method), $parameters);
-
-      return $this;
-    }
-
-    return parent::__call($method, $parameters);
-  }
-
-  /**
-   * Prints out the field, wrapped in its group
-   *
-   * @return string
-   */
-  public function wrapAndRender()
-  {
-    // Dry syntax (hidden fields, plain fields)
-    if ($this->isUnwrappable()) {
-      $html = $this->render();
-
-    // Control group syntax
-    } elseif (Form::hasInstanceOpened()) {
-      $html = $this->group->wrapField($this);
-
-    // Classic syntax
-    } else {
-      $html  = $this->currentFramework()->createLabelOf($this);
-      $html .= $this->render();
-    }
-
-    return $html;
-  }
-
-  /**
-   * Prints out the field
-   *
-   * @return string
-   */
-  public function __toString()
-  {
-    return $this->wrapAndRender();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////// PUBLIC INTERFACE ////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Whether the current field is required or not
-   *
-   * @return boolean
-   */
-  public function isRequired()
-  {
-    return isset($this->attributes['required']);
-  }
-
-  /**
-   * Check if a field is unwrappable (no label)
-   *
-   * @return boolean
-   */
-  public function isUnwrappable()
-  {
-    return
-      ($this->form and $this->currentFramework()->is('Nude')) or
-      ($this->form and $this->isOfType('inline')) or
-      $this->isButton() or
-      $this->isOfType('hidden') or
-      \Former\Form\Group::$opened or
-      $this->group and $this->group->isRaw();
-  }
-
-  /**
-   * Check if field is a checkbox or a radio
-   *
-   * @return boolean
-   */
-  public function isCheckable()
-  {
-    return $this->isOfType('checkbox', 'checkboxes', 'radio', 'radios');
-  }
-
-  /**
-   * Check if the field is a button
-   *
-   * @return boolean
-   */
-  public function isButton()
-  {
-    return false;
-  }
-
-  /**
-   * Get the rules applied to the current field
-   *
-   * @return array An array of rules
-   */
-  public function getRules()
-  {
-    return $this->app['former']->getRules($this->name);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////// SETTERS AND GETTERS ///////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Apply a Live Validation rule by chaining
-   *
-   * @param string $rule The rule
-   * @param mixed $parameters* The rule parameters
-   */
-  public function rule($rule)
-  {
-    $parameters = func_get_args();
-    array_shift($parameters);
-
-    $live = new LiveValidation($this);
-    $live->apply(array(
-      $rule => $parameters,
-    ));
-
-    return $this;
-  }
-
-  /**
-   * Adds a label to the group/field
-   *
-   * @param  string $text       A label
-   * @param  array  $attributes The label's attributes
-   * @return Field              A field
-   */
-  public function label($text, $attributes = array())
-  {
-    // Create the Label element
-    $for   = $this->id ?: $this->name;
-    $label = $this->app['former']->label($text, $for, $attributes);
-
-    // Set label
-    $this->label = $label;
-    if ($this->group) {
-      $this->group->setLabel($label);
-    }
-
-    return $this;
-  }
-
-  /**
-   * Set the Field value no matter what
-   *
-   * @param string $value A new value
-   */
-  public function forceValue($value)
-  {
-    $this->value = $value;
-
-    return $this;
-  }
-
-  /**
-   * Classic setting of attribute, won't overwrite any populate() attempt
-   *
-   * @param  string $value A new value
-   */
-  public function value($value)
-  {
-    // Check if we already have a value stored for this field or in POST data
-    $already = $this->repopulate();
-
-    if (!$already) {
-      $this->value = $value;
-    }
-
-    return $this;
-  }
-
-  /**
-   * Change the field's name
-   *
-   * @param  string $name The new name
-   */
-  public function name($name)
-  {
-    $this->name = $name;
-
-    // Also relink the label to the new name
-    $this->label($name);
-
-    return $this;
-  }
-
-  /**
-   * Get the field's labels
-   *
-   * @return array
-   */
-  public function getLabel()
-  {
-    return $this->label;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// HELPERS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Use values stored in Former to populate the current field
-   */
-  private function repopulate($fallback = null)
-  {
-    // Get values from POST, populated, and manually set value
-    $post      = $this->app['former']->getPost($this->name);
-    $populator = $this->form ? $this->form->getPopulator() : $this->app['former.populator'];
-    $populate  = $populator->get($this->name);
-
-    // Assign a priority to each
-    if (!is_null($post)) {
-      return $post;
-    }
-    if (!is_null($populate)) {
-      return $populate;
-    }
-
-    return $fallback ?: $this->value;
-  }
-
-  /**
-   * Ponders a label and a field name, and tries to get the best out of it
-   *
-   * @param  string $label A label
-   * @param  string $name  A field name
-   * @return array         A label and a field name
-   */
-  private function automaticLabels($name, $label)
-  {
-    // Disabled automatic labels
-    if (!$this->app['former']->getOption('automatic_label')) {
-      $this->name = $name;
-      $this->label($label);
-
-      return false;
-    }
-
-    // Check for the two possibilities
-    if ($label and is_null($name)) {
-      $name = Str::slug($label);
-    } elseif (is_null($label) and $name) {
-      $label = preg_replace('/\[\]$/', '', $name);
-    }
-
-    // Save values
-    $this->name  = $name;
-    $this->label($label);
-  }
+	/**
+	 * The IoC Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
+
+	/**
+	 * The Form instance
+	 *
+	 * @var Former\Form
+	 */
+	protected $form;
+
+	/**
+	 * A label for the field (if not using Bootstrap)
+	 *
+	 * @var string
+	 */
+	protected $label;
+
+	/**
+	 * The field's group
+	 *
+	 * @var Group
+	 */
+	protected $group;
+
+	/**
+	 * The field's default element
+	 *
+	 * @var string
+	 */
+	protected $element = 'input';
+
+	/**
+	 * Whether the Field is self-closing or not
+	 *
+	 * @var boolean
+	 */
+	protected $isSelfClosing = true;
+
+	/**
+	 * Get the current framework instance
+	 *
+	 * @return Framework
+	 */
+	protected function currentFramework()
+	{
+		if ($this->app->bound('former.form.framework')) {
+			return $this->app['former.form.framework'];
+		}
+
+		return $this->app['former.framework'];
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// INTERFACE ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Set up a Field instance
+	 *
+	 * @param string $type A field type
+	 */
+	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+	{
+		// Set base parameters
+		$this->app   = $app;
+		$this->type  = $type;
+		$this->value = $value;
+		$this->setAttributes($attributes);
+		$this->form = $this->app->bound('former.form') ? $this->app['former.form'] : null;
+
+		// Compute and translate label
+		$this->automaticLabels($name, $label);
+
+		// Repopulate field
+		if ($type != 'password') {
+			$this->value = $this->repopulate();
+		}
+
+		// Apply Live validation rules
+		if ($this->app['former']->getOption('live_validation')) {
+			$rules = new LiveValidation($this);
+			$rules->apply($this->getRules());
+		}
+
+		// Bind the Group class
+		$groupClass = $this->isCheckable() ? 'CheckableGroup' : 'Group';
+		$groupClass = Former::FORMSPACE.$groupClass;
+
+		$this->group = new $groupClass($this->app, $this->label);
+	}
+
+	/**
+	 * Redirect calls to the group if necessary
+	 */
+	public function __call($method, $parameters)
+	{
+		// Translate attributes
+		$translatable = $this->app['former']->getOption('translatable', array());
+		if (in_array($method, $translatable) and isset($parameters[0])) {
+			$parameters[0] = Helpers::translate($parameters[0]);
+		}
+
+		// Redirect calls to the Control Group
+		if (method_exists($this->group, $method) or Str::startsWith($method, 'onGroup')) {
+			$method = str_replace('onGroup', '', $method);
+			$method = lcfirst($method);
+
+			call_user_func_array(array($this->group, $method), $parameters);
+
+			return $this;
+		}
+
+		return parent::__call($method, $parameters);
+	}
+
+	/**
+	 * Prints out the field, wrapped in its group
+	 *
+	 * @return string
+	 */
+	public function wrapAndRender()
+	{
+		// Dry syntax (hidden fields, plain fields)
+		if ($this->isUnwrappable()) {
+			$html = $this->render();
+			// Control group syntax
+		} elseif (Form::hasInstanceOpened()) {
+			$html = $this->group->wrapField($this);
+			// Classic syntax
+		} else {
+			$html = $this->currentFramework()->createLabelOf($this);
+			$html .= $this->render();
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Prints out the field
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->wrapAndRender();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////// PUBLIC INTERFACE ////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Whether the current field is required or not
+	 *
+	 * @return boolean
+	 */
+	public function isRequired()
+	{
+		return isset($this->attributes['required']);
+	}
+
+	/**
+	 * Check if a field is unwrappable (no label)
+	 *
+	 * @return boolean
+	 */
+	public function isUnwrappable()
+	{
+		return
+			($this->form and $this->currentFramework()->is('Nude')) or
+			($this->form and $this->isOfType('inline')) or
+			$this->isButton() or
+			$this->isOfType('hidden') or
+			\Former\Form\Group::$opened or
+			$this->group and $this->group->isRaw();
+	}
+
+	/**
+	 * Check if field is a checkbox or a radio
+	 *
+	 * @return boolean
+	 */
+	public function isCheckable()
+	{
+		return $this->isOfType('checkbox', 'checkboxes', 'radio', 'radios');
+	}
+
+	/**
+	 * Check if the field is a button
+	 *
+	 * @return boolean
+	 */
+	public function isButton()
+	{
+		return false;
+	}
+
+	/**
+	 * Get the rules applied to the current field
+	 *
+	 * @return array An array of rules
+	 */
+	public function getRules()
+	{
+		return $this->app['former']->getRules($this->name);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////// SETTERS AND GETTERS ///////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Apply a Live Validation rule by chaining
+	 *
+	 * @param string $rule       The rule
+	 * @param mixed  $parameters * The rule parameters
+	 */
+	public function rule($rule)
+	{
+		$parameters = func_get_args();
+		array_shift($parameters);
+
+		$live = new LiveValidation($this);
+		$live->apply(array(
+			$rule => $parameters,
+		));
+
+		return $this;
+	}
+
+	/**
+	 * Adds a label to the group/field
+	 *
+	 * @param  string $text       A label
+	 * @param  array  $attributes The label's attributes
+	 *
+	 * @return Field              A field
+	 */
+	public function label($text, $attributes = array())
+	{
+		// Create the Label element
+		$for   = $this->id ?: $this->name;
+		$label = $this->app['former']->label($text, $for, $attributes);
+
+		// Set label
+		$this->label = $label;
+		if ($this->group) {
+			$this->group->setLabel($label);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the Field value no matter what
+	 *
+	 * @param string $value A new value
+	 */
+	public function forceValue($value)
+	{
+		$this->value = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Classic setting of attribute, won't overwrite any populate() attempt
+	 *
+	 * @param  string $value A new value
+	 */
+	public function value($value)
+	{
+		// Check if we already have a value stored for this field or in POST data
+		$already = $this->repopulate();
+
+		if (!$already) {
+			$this->value = $value;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Change the field's name
+	 *
+	 * @param  string $name The new name
+	 */
+	public function name($name)
+	{
+		$this->name = $name;
+
+		// Also relink the label to the new name
+		$this->label($name);
+
+		return $this;
+	}
+
+	/**
+	 * Get the field's labels
+	 *
+	 * @return array
+	 */
+	public function getLabel()
+	{
+		return $this->label;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// HELPERS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Use values stored in Former to populate the current field
+	 */
+	private function repopulate($fallback = null)
+	{
+		// Get values from POST, populated, and manually set value
+		$post      = $this->app['former']->getPost($this->name);
+		$populator = $this->form ? $this->form->getPopulator() : $this->app['former.populator'];
+		$populate  = $populator->get($this->name);
+
+		// Assign a priority to each
+		if (!is_null($post)) {
+			return $post;
+		}
+		if (!is_null($populate)) {
+			return $populate;
+		}
+
+		return $fallback ?: $this->value;
+	}
+
+	/**
+	 * Ponders a label and a field name, and tries to get the best out of it
+	 *
+	 * @param  string $label A label
+	 * @param  string $name  A field name
+	 *
+	 * @return array         A label and a field name
+	 */
+	private function automaticLabels($name, $label)
+	{
+		// Disabled automatic labels
+		if (!$this->app['former']->getOption('automatic_label')) {
+			$this->name = $name;
+			$this->label($label);
+
+			return false;
+		}
+
+		// Check for the two possibilities
+		if ($label and is_null($name)) {
+			$name = Str::slug($label);
+		} elseif (is_null($label) and $name) {
+			$label = preg_replace('/\[\]$/', '', $name);
+		}
+
+		// Save values
+		$this->name = $name;
+		$this->label($label);
+	}
 }
diff --git a/src/Former/Traits/FormerObject.php b/src/Former/Traits/FormerObject.php
index 9d712de8..651ba625 100644
--- a/src/Former/Traits/FormerObject.php
+++ b/src/Former/Traits/FormerObject.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Traits;
 
-use Former\Former;
 use Former\Helpers;
 use HtmlObject\Element;
 
@@ -11,149 +10,151 @@
  */
 abstract class FormerObject extends Element
 {
-  /**
-   * The field's name
-   *
-   * @var string
-   */
-  protected $name;
-
-  /**
-   * The field type
-   *
-   * @var string
-   */
-  protected $type;
-
-  /**
-   * A list of class properties to be added to attributes
-   *
-   * @var array
-   */
-  protected $injectedProperties = array('name');
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// ID AND LABELS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Create an unique ID and return it
-   *
-   * @return string
-   */
-  public function getCreatedId()
-  {
-    $this->setId();
-
-    return $this->attributes['id'];
-  }
-
-  /**
-   * Set the matching ID on a field if possible
-   */
-  protected function setId()
-  {
-    if (!array_key_exists('id', $this->attributes) and
-      in_array($this->name, $this->app['former']->labels)) {
-        // Set and save the field's ID
-        $id = $this->getUniqueId($this->name);
-        $this->attributes['id']     = $id;
-        $this->app['former']->ids[] = $id;
-    }
-  }
-
-  /**
-   * Get an unique ID for a field from its name
-   *
-   * @param string $name
-   *
-   * @return string
-   */
-  protected function getUniqueId($name)
-  {
-    $existing = $this->app['former']->ids;
-    if (!in_array($name, $existing)) {
-      return $name;
-    }
-
-    // Get the number of existing occurences
-    $existing = array_filter($existing, function ($value) use ($name) {
-      return $value == $name;
-    });
-    $existing = sizeof($existing) + 1;
-
-    return $name.'-'.$existing;
-  }
-
-  /**
-   * Render the FormerObject and set its id
-   *
-   * @return string
-   */
-  public function render()
-  {
-    // Set the proper ID according to the label
-    $this->setId();
-
-    // Encode HTML value
-    $isButton = ($this instanceof Field) ? $this->isButton() : false;
-    if (!$isButton and is_string($this->value)) {
-      $this->value = Helpers::encode($this->value);
-    }
-
-    return parent::render();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// GETTERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Get the object's name
-   *
-   * @return string
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// OBJECT TYPE ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Get the object's type
-   *
-   * @return string
-   */
-  public function getType()
-  {
-    return $this->type;
-  }
-
-  /**
-   * Change a object's type
-   *
-   * @param string $type
-   */
-  public function setType($type)
-  {
-    $this->type = $type;
-
-    return $this;
-  }
-
-  /**
-   * Check if an object is of a certain type
-   *
-   * @param  string $types* The type(s) to check for
-   * @return boolean
-   */
-  public function isOfType()
-  {
-    $types = func_get_args();
-
-    return in_array($this->type, $types);
-  }
+	/**
+	 * The field's name
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * The field type
+	 *
+	 * @var string
+	 */
+	protected $type;
+
+	/**
+	 * A list of class properties to be added to attributes
+	 *
+	 * @var array
+	 */
+	protected $injectedProperties = array('name');
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// ID AND LABELS //////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Create an unique ID and return it
+	 *
+	 * @return string
+	 */
+	public function getCreatedId()
+	{
+		$this->setId();
+
+		return $this->attributes['id'];
+	}
+
+	/**
+	 * Set the matching ID on a field if possible
+	 */
+	protected function setId()
+	{
+		if (!array_key_exists('id', $this->attributes) and
+			in_array($this->name, $this->app['former']->labels)
+		) {
+			// Set and save the field's ID
+			$id                         = $this->getUniqueId($this->name);
+			$this->attributes['id']     = $id;
+			$this->app['former']->ids[] = $id;
+		}
+	}
+
+	/**
+	 * Get an unique ID for a field from its name
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	protected function getUniqueId($name)
+	{
+		$existing = $this->app['former']->ids;
+		if (!in_array($name, $existing)) {
+			return $name;
+		}
+
+		// Get the number of existing occurences
+		$existing = array_filter($existing, function ($value) use ($name) {
+			return $value == $name;
+		});
+		$existing = sizeof($existing) + 1;
+
+		return $name.'-'.$existing;
+	}
+
+	/**
+	 * Render the FormerObject and set its id
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		// Set the proper ID according to the label
+		$this->setId();
+
+		// Encode HTML value
+		$isButton = ($this instanceof Field) ? $this->isButton() : false;
+		if (!$isButton and is_string($this->value)) {
+			$this->value = Helpers::encode($this->value);
+		}
+
+		return parent::render();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// GETTERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Get the object's name
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// OBJECT TYPE ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Get the object's type
+	 *
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * Change a object's type
+	 *
+	 * @param string $type
+	 */
+	public function setType($type)
+	{
+		$this->type = $type;
+
+		return $this;
+	}
+
+	/**
+	 * Check if an object is of a certain type
+	 *
+	 * @param  string $types * The type(s) to check for
+	 *
+	 * @return boolean
+	 */
+	public function isOfType()
+	{
+		$types = func_get_args();
+
+		return in_array($this->type, $types);
+	}
 }
diff --git a/src/Former/Traits/Framework.php b/src/Former/Traits/Framework.php
index 392d8c3f..77f5cd88 100644
--- a/src/Former/Traits/Framework.php
+++ b/src/Former/Traits/Framework.php
@@ -1,7 +1,6 @@
 <?php
 namespace Former\Traits;
 
-use Former\Traits\Field;
 use HtmlObject\Element;
 
 /**
@@ -9,300 +8,303 @@
  */
 abstract class Framework
 {
-  /**
-   * The Container
-   *
-   * @var Container
-   */
-  protected $app;
-
-  /**
-   * Form types that trigger special styling
-   *
-   * @var array
-   */
-  protected $availableTypes = array();
-
-  /**
-   * The field states available
-   * @var array
-   */
-  protected $states = array();
-
-  /**
-   * The default label width (for horizontal forms)
-   *
-   * @var string
-   */
-  protected $labelWidth;
-
-  /**
-   * The default field width (for horizontal forms)
-   *
-   * @var string
-   */
-  protected $fieldWidth;
-
-  /**
-   * The default offset for fields (for horizontal form fields
-   * with no label, so usually equal to the default label width)
-   *
-   * @var string
-   */
-  protected $fieldOffset;
-
-  /**
-   * The default HTML tag used for icons
-   *
-   * @var string
-   */
-  protected $iconTag;
-
-  /**
-   * The default set for icon fonts
-   *
-   * @var string
-   */
-  protected $iconSet;
-
-  /**
-   * The default prefix icon names
-   *
-   * @var string
-   */
-  protected $iconPrefix;
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////// CURRENT FRAMEWORK /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Get the name of the current framework
-   *
-   * @return string
-   */
-  public function current()
-  {
-    return basename(str_replace('\\', '/', get_class($this)));
-  }
-
-  /**
-   * Check if the current framework matches something
-   *
-   * @param  string $framework
-   *
-   * @return boolean
-   */
-  public function is($framework)
-  {
-    return $framework == $this->current();
-  }
-
-  /**
-   * Check if the current framework doesn't match something
-   *
-   * @param  string $framework
-   *
-   * @return boolean
-   */
-  public function isnt($framework)
-  {
-    return $framework != $this->current();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// COMMON METHODS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * List form types triggered special styling form current framework
-   *
-   * @return array
-   */
-  public function availableTypes()
-  {
-    return $this->availableTypes;
-  }
-
-  /**
-   * Filter a field state
-   *
-   * @param string $state
-   *
-   * @return string
-   */
-  public function filterState($state)
-  {
-    // Filter out wrong states
-    return in_array($state, $this->states) ? $state : null;
-  }
-
-  /**
-   * Framework error state
-   *
-   * @return string
-   */
-  public function errorState()
-  {
-    return 'error';
-  }
-
-
-  /**
-   * Returns corresponding inline class of a field
-   *
-   * @param Field $field
-   *
-   * @return string
-   */
-  public function getInlineLabelClass($field)
-  {
-    return 'inline';
-  }
-
-  /**
-   * Set framework defaults from its config file
-   */
-  protected function setFrameworkDefaults()
-  {
-    $this->setFieldWidths($this->getFrameworkOption('labelWidths'));
-    $this->setIconDefaults();
-  }
-
-  protected function setFieldWidths($widths) {}
-
-  /**
-   * Override framework defaults for icons with config values where set
-   */
-  protected function setIconDefaults()
-  {
-    $this->iconTag    = $this->getFrameworkOption('icon.tag');
-    $this->iconSet    = $this->getFrameworkOption('icon.set');
-    $this->iconPrefix = $this->getFrameworkOption('icon.prefix');
-  }
-
-  /**
-   * Render an icon
-   *
-   * @param string $icon          The icon name
-   * @param array  $attributes    Its general attributes
-   * @param array  $iconSettings  Icon-specific settings
-   *
-   * @return string
-   */
-  public function createIcon($iconType, $attributes = array(), $iconSettings = array())
-  {
-    // Check for empty icons
-    if (!$iconType) {
-      return false;
-    }
-
-    // icon settings can be overridden for a specific icon
-    $tag    = array_get($iconSettings, 'tag', $this->iconTag);
-    $set    = array_get($iconSettings, 'set', $this->iconSet);
-    $prefix = array_get($iconSettings, 'prefix', $this->iconPrefix);
-
-    return Element::create($tag, null, $attributes)->addClass("$set $prefix-$iconType");
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// HELPERS //////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Add classes to a field
-   *
-   * @param Field $field
-   * @param array $classes
-   */
-  protected function addClassesToField($field, $classes)
-  {
-    // If we found any class, add them
-    if ($classes) {
-      $field->addClass(implode(' ', $classes));
-    }
-
-    return $field;
-  }
-
-  /**
-   * Prepend an array of classes with a string
-   *
-   * @param array  $classes The classes to prepend
-   * @param string $with    The string to prepend them with
-   *
-   * @return array A prepended array
-   */
-  protected function prependWith($classes, $with)
-  {
-    return array_map(function ($class) use ($with) {
-      return $with.$class;
-    }, $classes);
-  }
-
-  /**
-   * Create a label for a field
-   *
-   * @param Field  $field
-   * @param string $label The field label if non provided
-   *
-   * @return string A label
-   */
-  public function createLabelOf(Field $field, Element $label = null)
-  {
-    // Get the label and its informations
-    if (!$label) {
-      $label = $field->getLabel();
-    }
-
-    // Get label "for"
-    $for = $field->id ?: $field->getName();
-
-    // Get label text
-    $text = $label->getValue();
-    if (!$text) {
-      return false;
-    }
-
-    // Append required text
-    if ($field->isRequired()) {
-      $text .= $this->app['former']->getOption('required_text');
-    }
-
-    // Render plain label if checkable, else a classic one
-    $label->setValue($text);
-    if (!$field->isCheckable()) {
-      $label->for($for);
-    }
-
-    return $label;
-  }
-
-  /**
-   * Get an option for the current framework
-   *
-   * @param string $option
-   *
-   * @return string
-   */
-  protected function getFrameworkOption($option)
-  {
-    return $this->app['config']->get("former::{$this->current()}.$option");
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////// WRAP BLOCKS ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Wraps all label contents with potential additional tags.
-   *
-   * @param  string $label
-   *
-   * @return string A wrapped label
-   */
-  public function wrapLabel($label)
-  {
-    return $label;
-  }
+	/**
+	 * The Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
+
+	/**
+	 * Form types that trigger special styling
+	 *
+	 * @var array
+	 */
+	protected $availableTypes = array();
+
+	/**
+	 * The field states available
+	 *
+	 * @var array
+	 */
+	protected $states = array();
+
+	/**
+	 * The default label width (for horizontal forms)
+	 *
+	 * @var string
+	 */
+	protected $labelWidth;
+
+	/**
+	 * The default field width (for horizontal forms)
+	 *
+	 * @var string
+	 */
+	protected $fieldWidth;
+
+	/**
+	 * The default offset for fields (for horizontal form fields
+	 * with no label, so usually equal to the default label width)
+	 *
+	 * @var string
+	 */
+	protected $fieldOffset;
+
+	/**
+	 * The default HTML tag used for icons
+	 *
+	 * @var string
+	 */
+	protected $iconTag;
+
+	/**
+	 * The default set for icon fonts
+	 *
+	 * @var string
+	 */
+	protected $iconSet;
+
+	/**
+	 * The default prefix icon names
+	 *
+	 * @var string
+	 */
+	protected $iconPrefix;
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////// CURRENT FRAMEWORK /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Get the name of the current framework
+	 *
+	 * @return string
+	 */
+	public function current()
+	{
+		return basename(str_replace('\\', '/', get_class($this)));
+	}
+
+	/**
+	 * Check if the current framework matches something
+	 *
+	 * @param  string $framework
+	 *
+	 * @return boolean
+	 */
+	public function is($framework)
+	{
+		return $framework == $this->current();
+	}
+
+	/**
+	 * Check if the current framework doesn't match something
+	 *
+	 * @param  string $framework
+	 *
+	 * @return boolean
+	 */
+	public function isnt($framework)
+	{
+		return $framework != $this->current();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// COMMON METHODS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * List form types triggered special styling form current framework
+	 *
+	 * @return array
+	 */
+	public function availableTypes()
+	{
+		return $this->availableTypes;
+	}
+
+	/**
+	 * Filter a field state
+	 *
+	 * @param string $state
+	 *
+	 * @return string
+	 */
+	public function filterState($state)
+	{
+		// Filter out wrong states
+		return in_array($state, $this->states) ? $state : null;
+	}
+
+	/**
+	 * Framework error state
+	 *
+	 * @return string
+	 */
+	public function errorState()
+	{
+		return 'error';
+	}
+
+
+	/**
+	 * Returns corresponding inline class of a field
+	 *
+	 * @param Field $field
+	 *
+	 * @return string
+	 */
+	public function getInlineLabelClass($field)
+	{
+		return 'inline';
+	}
+
+	/**
+	 * Set framework defaults from its config file
+	 */
+	protected function setFrameworkDefaults()
+	{
+		$this->setFieldWidths($this->getFrameworkOption('labelWidths'));
+		$this->setIconDefaults();
+	}
+
+	protected function setFieldWidths($widths)
+	{
+	}
+
+	/**
+	 * Override framework defaults for icons with config values where set
+	 */
+	protected function setIconDefaults()
+	{
+		$this->iconTag    = $this->getFrameworkOption('icon.tag');
+		$this->iconSet    = $this->getFrameworkOption('icon.set');
+		$this->iconPrefix = $this->getFrameworkOption('icon.prefix');
+	}
+
+	/**
+	 * Render an icon
+	 *
+	 * @param string $icon         The icon name
+	 * @param array  $attributes   Its general attributes
+	 * @param array  $iconSettings Icon-specific settings
+	 *
+	 * @return string
+	 */
+	public function createIcon($iconType, $attributes = array(), $iconSettings = array())
+	{
+		// Check for empty icons
+		if (!$iconType) {
+			return false;
+		}
+
+		// icon settings can be overridden for a specific icon
+		$tag    = array_get($iconSettings, 'tag', $this->iconTag);
+		$set    = array_get($iconSettings, 'set', $this->iconSet);
+		$prefix = array_get($iconSettings, 'prefix', $this->iconPrefix);
+
+		return Element::create($tag, null, $attributes)->addClass("$set $prefix-$iconType");
+	}
+
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// HELPERS //////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Add classes to a field
+	 *
+	 * @param Field $field
+	 * @param array $classes
+	 */
+	protected function addClassesToField($field, $classes)
+	{
+		// If we found any class, add them
+		if ($classes) {
+			$field->addClass(implode(' ', $classes));
+		}
+
+		return $field;
+	}
+
+	/**
+	 * Prepend an array of classes with a string
+	 *
+	 * @param array  $classes The classes to prepend
+	 * @param string $with    The string to prepend them with
+	 *
+	 * @return array A prepended array
+	 */
+	protected function prependWith($classes, $with)
+	{
+		return array_map(function ($class) use ($with) {
+			return $with.$class;
+		}, $classes);
+	}
+
+	/**
+	 * Create a label for a field
+	 *
+	 * @param Field  $field
+	 * @param string $label The field label if non provided
+	 *
+	 * @return string A label
+	 */
+	public function createLabelOf(Field $field, Element $label = null)
+	{
+		// Get the label and its informations
+		if (!$label) {
+			$label = $field->getLabel();
+		}
+
+		// Get label "for"
+		$for = $field->id ?: $field->getName();
+
+		// Get label text
+		$text = $label->getValue();
+		if (!$text) {
+			return false;
+		}
+
+		// Append required text
+		if ($field->isRequired()) {
+			$text .= $this->app['former']->getOption('required_text');
+		}
+
+		// Render plain label if checkable, else a classic one
+		$label->setValue($text);
+		if (!$field->isCheckable()) {
+			$label->for($for);
+		}
+
+		return $label;
+	}
+
+	/**
+	 * Get an option for the current framework
+	 *
+	 * @param string $option
+	 *
+	 * @return string
+	 */
+	protected function getFrameworkOption($option)
+	{
+		return $this->app['config']->get("former::{$this->current()}.$option");
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////// WRAP BLOCKS ///////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Wraps all label contents with potential additional tags.
+	 *
+	 * @param  string $label
+	 *
+	 * @return string A wrapped label
+	 */
+	public function wrapLabel($label)
+	{
+		return $label;
+	}
 }
diff --git a/src/Laravel/File.php b/src/Laravel/File.php
index 50f2248c..3c469f10 100644
--- a/src/Laravel/File.php
+++ b/src/Laravel/File.php
@@ -1,127 +1,128 @@
 <?php
 /**
  * File
- *
  * Port of Laravel 3's mime detection function
  */
 namespace Laravel;
 
 class File
 {
-  private static $mimes = array(
-    'ai'    => 'application/postscript',
-    'aif'   => 'audio/x-aiff',
-    'aifc'  => 'audio/x-aiff',
-    'aiff'  => 'audio/x-aiff',
-    'avi'   => 'video/x-msvideo',
-    'bin'   => 'application/macbinary',
-    'bmp'   => 'image/bmp',
-    'class' => 'application/octet-stream',
-    'cpt'   => 'application/mac-compactpro',
-    'css'   => 'text/css',
-    'csv'   => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'),
-    'dcr'   => 'application/x-director',
-    'dir'   => 'application/x-director',
-    'dll'   => 'application/octet-stream',
-    'dms'   => 'application/octet-stream',
-    'doc'   => 'application/msword',
-    'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-    'dvi'   => 'application/x-dvi',
-    'dxr'   => 'application/x-director',
-    'eml'   => 'message/rfc822',
-    'eps'   => 'application/postscript',
-    'exe'   => array('application/octet-stream', 'application/x-msdownload'),
-    'gif'   => 'image/gif',
-    'gtar'  => 'application/x-gtar',
-    'gz'    => 'application/x-gzip',
-    'hqx'   => 'application/mac-binhex40',
-    'htm'   => 'text/html',
-    'html'  => 'text/html',
-    'jpe'   => array('image/jpeg', 'image/pjpeg'),
-    'jpeg'  => array('image/jpeg', 'image/pjpeg'),
-    'jpg'   => array('image/jpeg', 'image/pjpeg'),
-    'js'    => 'application/x-javascript',
-    'json'  => array('application/json', 'text/json'),
-    'lha'   => 'application/octet-stream',
-    'log'   => array('text/plain', 'text/x-log'),
-    'lzh'   => 'application/octet-stream',
-    'mid'   => 'audio/midi',
-    'midi'  => 'audio/midi',
-    'mif'   => 'application/vnd.mif',
-    'mov'   => 'video/quicktime',
-    'movie' => 'video/x-sgi-movie',
-    'mp2'   => 'audio/mpeg',
-    'mp3'   => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
-    'mpe'   => 'video/mpeg',
-    'mpeg'  => 'video/mpeg',
-    'mpg'   => 'video/mpeg',
-    'mpga'  => 'audio/mpeg',
-    'oda'   => 'application/oda',
-    'pdf'   => array('application/pdf', 'application/x-download'),
-    'php'   => array('application/x-httpd-php', 'text/x-php'),
-    'php3'  => 'application/x-httpd-php',
-    'php4'  => 'application/x-httpd-php',
-    'phps'  => 'application/x-httpd-php-source',
-    'phtml' => 'application/x-httpd-php',
-    'png'   => 'image/png',
-    'ppt'   => array('application/powerpoint', 'application/vnd.ms-powerpoint'),
-    'ps'    => 'application/postscript',
-    'psd'   => 'application/x-photoshop',
-    'qt'    => 'video/quicktime',
-    'ra'    => 'audio/x-realaudio',
-    'ram'   => 'audio/x-pn-realaudio',
-    'rm'    => 'audio/x-pn-realaudio',
-    'rpm'   => 'audio/x-pn-realaudio-plugin',
-    'rtf'   => 'text/rtf',
-    'rtx'   => 'text/richtext',
-    'rv'    => 'video/vnd.rn-realvideo',
-    'sea'   => 'application/octet-stream',
-    'shtml' => 'text/html',
-    'sit'   => 'application/x-stuffit',
-    'smi'   => 'application/smil',
-    'smil'  => 'application/smil',
-    'so'    => 'application/octet-stream',
-    'swf'   => 'application/x-shockwave-flash',
-    'tar'   => 'application/x-tar',
-    'text'  => 'text/plain',
-    'tgz'   => array('application/x-tar', 'application/x-gzip-compressed'),
-    'tif'   => 'image/tiff',
-    'tiff'  => 'image/tiff',
-    'txt'   => 'text/plain',
-    'wav'   => 'audio/x-wav',
-    'wbxml' => 'application/wbxml',
-    'wmlc'  => 'application/wmlc',
-    'word'  => array('application/msword', 'application/octet-stream'),
-    'xht'   => 'application/xhtml+xml',
-    'xhtml' => 'application/xhtml+xml',
-    'xl'    => 'application/excel',
-    'xls'   => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
-    'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-    'xml'   => 'text/xml',
-    'xsl'   => 'text/xml',
-    'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
-  );
+	private static $mimes = array(
+		'ai'    => 'application/postscript',
+		'aif'   => 'audio/x-aiff',
+		'aifc'  => 'audio/x-aiff',
+		'aiff'  => 'audio/x-aiff',
+		'avi'   => 'video/x-msvideo',
+		'bin'   => 'application/macbinary',
+		'bmp'   => 'image/bmp',
+		'class' => 'application/octet-stream',
+		'cpt'   => 'application/mac-compactpro',
+		'css'   => 'text/css',
+		'csv'   => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'),
+		'dcr'   => 'application/x-director',
+		'dir'   => 'application/x-director',
+		'dll'   => 'application/octet-stream',
+		'dms'   => 'application/octet-stream',
+		'doc'   => 'application/msword',
+		'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+		'dvi'   => 'application/x-dvi',
+		'dxr'   => 'application/x-director',
+		'eml'   => 'message/rfc822',
+		'eps'   => 'application/postscript',
+		'exe'   => array('application/octet-stream', 'application/x-msdownload'),
+		'gif'   => 'image/gif',
+		'gtar'  => 'application/x-gtar',
+		'gz'    => 'application/x-gzip',
+		'hqx'   => 'application/mac-binhex40',
+		'htm'   => 'text/html',
+		'html'  => 'text/html',
+		'jpe'   => array('image/jpeg', 'image/pjpeg'),
+		'jpeg'  => array('image/jpeg', 'image/pjpeg'),
+		'jpg'   => array('image/jpeg', 'image/pjpeg'),
+		'js'    => 'application/x-javascript',
+		'json'  => array('application/json', 'text/json'),
+		'lha'   => 'application/octet-stream',
+		'log'   => array('text/plain', 'text/x-log'),
+		'lzh'   => 'application/octet-stream',
+		'mid'   => 'audio/midi',
+		'midi'  => 'audio/midi',
+		'mif'   => 'application/vnd.mif',
+		'mov'   => 'video/quicktime',
+		'movie' => 'video/x-sgi-movie',
+		'mp2'   => 'audio/mpeg',
+		'mp3'   => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
+		'mpe'   => 'video/mpeg',
+		'mpeg'  => 'video/mpeg',
+		'mpg'   => 'video/mpeg',
+		'mpga'  => 'audio/mpeg',
+		'oda'   => 'application/oda',
+		'pdf'   => array('application/pdf', 'application/x-download'),
+		'php'   => array('application/x-httpd-php', 'text/x-php'),
+		'php3'  => 'application/x-httpd-php',
+		'php4'  => 'application/x-httpd-php',
+		'phps'  => 'application/x-httpd-php-source',
+		'phtml' => 'application/x-httpd-php',
+		'png'   => 'image/png',
+		'ppt'   => array('application/powerpoint', 'application/vnd.ms-powerpoint'),
+		'ps'    => 'application/postscript',
+		'psd'   => 'application/x-photoshop',
+		'qt'    => 'video/quicktime',
+		'ra'    => 'audio/x-realaudio',
+		'ram'   => 'audio/x-pn-realaudio',
+		'rm'    => 'audio/x-pn-realaudio',
+		'rpm'   => 'audio/x-pn-realaudio-plugin',
+		'rtf'   => 'text/rtf',
+		'rtx'   => 'text/richtext',
+		'rv'    => 'video/vnd.rn-realvideo',
+		'sea'   => 'application/octet-stream',
+		'shtml' => 'text/html',
+		'sit'   => 'application/x-stuffit',
+		'smi'   => 'application/smil',
+		'smil'  => 'application/smil',
+		'so'    => 'application/octet-stream',
+		'swf'   => 'application/x-shockwave-flash',
+		'tar'   => 'application/x-tar',
+		'text'  => 'text/plain',
+		'tgz'   => array('application/x-tar', 'application/x-gzip-compressed'),
+		'tif'   => 'image/tiff',
+		'tiff'  => 'image/tiff',
+		'txt'   => 'text/plain',
+		'wav'   => 'audio/x-wav',
+		'wbxml' => 'application/wbxml',
+		'wmlc'  => 'application/wmlc',
+		'word'  => array('application/msword', 'application/octet-stream'),
+		'xht'   => 'application/xhtml+xml',
+		'xhtml' => 'application/xhtml+xml',
+		'xl'    => 'application/excel',
+		'xls'   => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
+		'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+		'xml'   => 'text/xml',
+		'xsl'   => 'text/xml',
+		'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
+	);
 
-  /**
-   * Get a file MIME type by extension.
-   *
-   * <code>
-   *    // Determine the MIME type for the .tar extension
-   *    $mime = File::mime('tar');
-   *
-   *    // Return a default value if the MIME can't be determined
-   *    $mime = File::mime('ext', 'application/octet-stream');
-   * </code>
-   *
-   * @param  string $extension
-   * @param  string $default
-   * @return string
-   */
-  public static function mime($extension, $default = 'application/octet-stream')
-  {
-    $mimes = self::$mimes;
+	/**
+	 * Get a file MIME type by extension.
+	 * <code>
+	 *    // Determine the MIME type for the .tar extension
+	 *    $mime = File::mime('tar');
+	 *    // Return a default value if the MIME can't be determined
+	 *    $mime = File::mime('ext', 'application/octet-stream');
+	 * </code>
+	 *
+	 * @param  string $extension
+	 * @param  string $default
+	 *
+	 * @return string
+	 */
+	public static function mime($extension, $default = 'application/octet-stream')
+	{
+		$mimes = self::$mimes;
 
-    if ( ! array_key_exists($extension, $mimes)) return $default;
-    return (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
-  }
+		if (!array_key_exists($extension, $mimes)) {
+			return $default;
+		}
+
+		return (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
+	}
 }
diff --git a/src/config/ZurbFoundation.php b/src/config/ZurbFoundation.php
index f16e2a46..58e89f5b 100644
--- a/src/config/ZurbFoundation.php
+++ b/src/config/ZurbFoundation.php
@@ -27,7 +27,7 @@
 		'prefix' => 'fi',
 	),
 
-        // CSS for inline validation errors 
+        // CSS for inline validation errors
         // should work for Zurb 2 and 3
         'error_classes' => array('class' => 'alert-box alert error')
 
diff --git a/tests/ActionsTest.php b/tests/ActionsTest.php
index 2d761100..8bc0486b 100644
--- a/tests/ActionsTest.php
+++ b/tests/ActionsTest.php
@@ -5,96 +5,95 @@
 
 class ActionsTest extends FormerTests
 {
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function matchActions($content = 'foo')
-  {
-    return array(
-      'tag'        => 'div',
-      'content'    => $content,
-      'attributes' => array('class' => 'form-actions'),
-    );
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanCreateAnActionBlock()
-  {
-    $action = $this->former->actions('foo')->__toString();
-
-    $this->assertHTML($this->matchActions(), $action);
-  }
-
-  public function testCanCreateAnActionsBlock()
-  {
-    $actions = $this->former->actions('foo', 'bar')->__toString();
-
-    $this->assertHTML($this->matchActions('foo bar'), $actions);
-  }
-
-  public function testCanCreateAnActionsBlockWithTags()
-  {
-    $actions = $this->former->actions('<button>Submit</button>', '<button type="reset">Reset</button>')->__toString();
-    $matcher = $this->matchActions();
-    unset($matcher['content']);
-    $matcher['children'] = array(
-      'count' => 2,
-      'only' => array(
-        'tag' => 'button',
-      ),
-    );
-
-    $this->assertHTML($matcher, $actions);
-  }
-
-  public function testCanUseObjectsAsActions()
-  {
-    $actions = $this->former->actions($this->former->submit('submit'), $this->former->reset('reset'))->__toString();
-
-    $matcher = array('tag' => 'div', 'attributes' => array('class' => 'form-actions'));
-    $matcher['child'] = $this->matchInputButton('btn', 'Submit', 'submit');
-    $this->assertHTML($matcher, $actions);
-
-    $matcher['child'] = $this->matchInputButton('btn', 'Reset', 'reset');
-    $this->assertHTML($matcher, $actions);
-  }
-
-  public function testCanChainMethodsToActionsBlock()
-  {
-    $actions = $this->former->actions('content')->id('foo')->addClass('bar')->data_foo('bar')->__toString();
-    $matcher = $this->matchActions('content');
-    $matcher['attributes'] = array(
-      'id'       => 'foo',
-      'class'    => 'bar form-actions',
-      'data-foo' => 'bar',
-    );
-
-    $this->assertHTML($matcher, $actions);
-  }
-
-  public function testCanChainActionsToActionsBlock()
-  {
-    $actions = $this->former->actions()
-      ->data_submit('foo')
-      ->large_primary_submit('submit')
-      ->small_block_inverse_reset('reset')
-      ->__toString();
-
-    // Match block
-    $matcher = $this->matchActions();
-    unset($matcher['content']);
-    $this->assertHTML($matcher, $actions);
-
-    // Match buttons
-    $matcher['child'] = $this->matchInputButton('btn-large btn-primary btn', 'Submit', 'submit');
-    $this->assertHTML($matcher, $actions);
-
-    $matcher['child'] = $this->matchInputButton('btn-small btn-block btn-inverse btn', 'Reset', 'reset');
-    $this->assertHTML($matcher, $actions);
-  }
-
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function matchActions($content = 'foo')
+	{
+		return array(
+			'tag'        => 'div',
+			'content'    => $content,
+			'attributes' => array('class' => 'form-actions'),
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanCreateAnActionBlock()
+	{
+		$action = $this->former->actions('foo')->__toString();
+
+		$this->assertHTML($this->matchActions(), $action);
+	}
+
+	public function testCanCreateAnActionsBlock()
+	{
+		$actions = $this->former->actions('foo', 'bar')->__toString();
+
+		$this->assertHTML($this->matchActions('foo bar'), $actions);
+	}
+
+	public function testCanCreateAnActionsBlockWithTags()
+	{
+		$actions = $this->former->actions('<button>Submit</button>', '<button type="reset">Reset</button>')->__toString();
+		$matcher = $this->matchActions();
+		unset($matcher['content']);
+		$matcher['children'] = array(
+			'count' => 2,
+			'only'  => array(
+				'tag' => 'button',
+			),
+		);
+
+		$this->assertHTML($matcher, $actions);
+	}
+
+	public function testCanUseObjectsAsActions()
+	{
+		$actions = $this->former->actions($this->former->submit('submit'), $this->former->reset('reset'))->__toString();
+
+		$matcher          = array('tag' => 'div', 'attributes' => array('class' => 'form-actions'));
+		$matcher['child'] = $this->matchInputButton('btn', 'Submit', 'submit');
+		$this->assertHTML($matcher, $actions);
+
+		$matcher['child'] = $this->matchInputButton('btn', 'Reset', 'reset');
+		$this->assertHTML($matcher, $actions);
+	}
+
+	public function testCanChainMethodsToActionsBlock()
+	{
+		$actions               = $this->former->actions('content')->id('foo')->addClass('bar')->data_foo('bar')->__toString();
+		$matcher               = $this->matchActions('content');
+		$matcher['attributes'] = array(
+			'id'       => 'foo',
+			'class'    => 'bar form-actions',
+			'data-foo' => 'bar',
+		);
+
+		$this->assertHTML($matcher, $actions);
+	}
+
+	public function testCanChainActionsToActionsBlock()
+	{
+		$actions = $this->former->actions()
+		                        ->data_submit('foo')
+		                        ->large_primary_submit('submit')
+		                        ->small_block_inverse_reset('reset')
+		                        ->__toString();
+
+		// Match block
+		$matcher = $this->matchActions();
+		unset($matcher['content']);
+		$this->assertHTML($matcher, $actions);
+
+		// Match buttons
+		$matcher['child'] = $this->matchInputButton('btn-large btn-primary btn', 'Submit', 'submit');
+		$this->assertHTML($matcher, $actions);
+
+		$matcher['child'] = $this->matchInputButton('btn-small btn-block btn-inverse btn', 'Reset', 'reset');
+		$this->assertHTML($matcher, $actions);
+	}
 }
diff --git a/tests/Dummy/DummyButton.php b/tests/Dummy/DummyButton.php
index b8a6bb3f..56e0d000 100644
--- a/tests/Dummy/DummyButton.php
+++ b/tests/Dummy/DummyButton.php
@@ -3,13 +3,13 @@
 
 class DummyButton
 {
-  public function __construct($text)
-  {
-    $this->text = $text;
-  }
+	public function __construct($text)
+	{
+		$this->text = $text;
+	}
 
-  public function __toString()
-  {
-    return '<button type="button" class="btn">' .$this->text. '</button>';
-  }
+	public function __toString()
+	{
+		return '<button type="button" class="btn">'.$this->text.'</button>';
+	}
 }
diff --git a/tests/Dummy/DummyEloquent.php b/tests/Dummy/DummyEloquent.php
index 1eeb0767..c6bd8272 100644
--- a/tests/Dummy/DummyEloquent.php
+++ b/tests/Dummy/DummyEloquent.php
@@ -6,30 +6,30 @@
 
 class DummyEloquent extends Model
 {
-  /**
-   * The guarded attributes
-   *
-   * @var array
-   */
-  protected $guarded = array();
+	/**
+	 * The guarded attributes
+	 *
+	 * @var array
+	 */
+	protected $guarded = array();
 
-  public function roles()
-  {
-    return Mockery::mock('Illuminate\Database\Eloquent\Relations\HasMany')
-      ->shouldReceive('getResults')->andReturn(array(
-        new DummyEloquent(array('id' => 1, 'name' => 'foo')),
-        new DummyEloquent(array('id' => 3, 'name' => 'bar')),
-      ))
-      ->mock();
-  }
+	public function roles()
+	{
+		return Mockery::mock('Illuminate\Database\Eloquent\Relations\HasMany')
+		              ->shouldReceive('getResults')->andReturn(array(
+				new DummyEloquent(array('id' => 1, 'name' => 'foo')),
+				new DummyEloquent(array('id' => 3, 'name' => 'bar')),
+			))
+		              ->mock();
+	}
 
-  public function getCustomAttribute()
-  {
-    return 'custom';
-  }
+	public function getCustomAttribute()
+	{
+		return 'custom';
+	}
 
-  public function __toString()
-  {
-    return $this->name;
-  }
+	public function __toString()
+	{
+		return $this->name;
+	}
 }
diff --git a/tests/Dummy/DummyToArray.php b/tests/Dummy/DummyToArray.php
index 2f79c04c..e6b83ab7 100644
--- a/tests/Dummy/DummyToArray.php
+++ b/tests/Dummy/DummyToArray.php
@@ -3,15 +3,15 @@
 
 class DummyToArray
 {
-  protected $values;
+	protected $values;
 
-  public function __construct(array $values = array())
-  {
-    $this->values = $values;
-  }
+	public function __construct(array $values = array())
+	{
+		$this->values = $values;
+	}
 
-  public function toArray()
-  {
-    return $this->values;
-  }
+	public function toArray()
+	{
+		return $this->values;
+	}
 }
diff --git a/tests/Fields/ButtonTest.php b/tests/Fields/ButtonTest.php
index b4ee7eab..293f3b00 100644
--- a/tests/Fields/ButtonTest.php
+++ b/tests/Fields/ButtonTest.php
@@ -6,95 +6,94 @@
 class ButtonTest extends FormerTests
 {
 
-  public function testCanCreateAButton()
-  {
-    $button  = $this->former->button('Save')->__toString();
-    $matcher = $this->matchButton('btn', 'Save');
-
-    $this->assertHTML($matcher, $button);
-  }
-
-  public function testCanChainMethodsToAButton()
-  {
-    $button  = $this->former->button('Save')->class('btn btn-primary')->value('Cancel')->__toString();
-    $matcher = $this->matchButton('btn btn-primary', 'Cancel');
-
-    $this->assertHTML($matcher, $button);
-  }
-
-  public function testCanCreateASubmitButton()
-  {
-    $button  = $this->former->submit('Save')->class('btn btn-primary')->__toString();
-    $matcher = $this->matchInputButton('btn btn-primary', 'Save');
-
-    $this->assertHTML($matcher, $button);
-  }
-
-  public function testCanUseFormerObjectMethods()
-  {
-    $button  = $this->former->button('pagination.next')->setAttributes($this->testAttributes)->__toString();
-    $matcher = $this->matchButton('foo', 'Next', array('data-foo' => 'bar'));
-
-    $this->assertHtml($matcher, $button);
-  }
-
-  public function testCanDynamicallyCreateButtons()
-  {
-    $button  = $this->former->large_block_primary_submit('Save')->__toString();
-    $matcher = $this->matchInputButton('btn-large btn-block btn-primary btn', 'Save');
-
-    $this->assertHTML($matcher, $button);
-  }
-
-  public function testCanCreateAResetButton()
-  {
-    $button  = $this->former->large_block_inverse_reset('Reset')->__toString();
-    $matcher = $this->matchInputButton('btn-large btn-block btn-inverse btn', 'Reset', 'reset');
-
-    $this->assertHTML($matcher, $button);
-  }
-
-  public function testCanHaveMultipleInstancesOfAButton()
-  {
-    $multiple = array($this->former->submit('submit'), $this->former->reset('reset'));
-    $multiple = implode(' ', $multiple);
-
-    $matcher1 = $this->matchInputButton('btn', 'Submit', 'submit');
-    $matcher2 = $this->matchInputButton('btn', 'Reset', 'reset');
-
-    $this->assertHTML($matcher1, $multiple);
-    $this->assertHTML($matcher2, $multiple);
-  }
-
-  public function testButtonsAreHtmlObjects()
-  {
-    $button = $this->former->submit('submit');
-    $button->name('foo');
-    $matcher = $this->matchInputButton('btn', 'Submit', 'submit');
-    $matcher['attributes']['name'] = 'foo';
-
-    $this->assertHTML($matcher, $button->render());
-  }
-
-  public function testLinksDontHaveTypeAttribute()
-  {
-    $this->former->horizontal_open();
-      $link = $this->former->link('#', 'foo')->__toString();
-    $this->former->close();
-
-    $this->assertEquals('<a href="foo" class="btn">#</a>', $link);
-  }
-
-  public function testCanCreateButtonWithIcon()
-  {
-    $button  = $this->former->button('Save')->icon('save');
-    $matcher = $this->matchButton('btn', 'Save');
-    $matcher['child'] = array(
-      'tag' => 'i',
-      'attributes' => array('class' => 'icon-save'),
-    );
-
-    $this->assertHTML($matcher, $button);
-  }
-
+	public function testCanCreateAButton()
+	{
+		$button  = $this->former->button('Save')->__toString();
+		$matcher = $this->matchButton('btn', 'Save');
+
+		$this->assertHTML($matcher, $button);
+	}
+
+	public function testCanChainMethodsToAButton()
+	{
+		$button  = $this->former->button('Save')->class('btn btn-primary')->value('Cancel')->__toString();
+		$matcher = $this->matchButton('btn btn-primary', 'Cancel');
+
+		$this->assertHTML($matcher, $button);
+	}
+
+	public function testCanCreateASubmitButton()
+	{
+		$button  = $this->former->submit('Save')->class('btn btn-primary')->__toString();
+		$matcher = $this->matchInputButton('btn btn-primary', 'Save');
+
+		$this->assertHTML($matcher, $button);
+	}
+
+	public function testCanUseFormerObjectMethods()
+	{
+		$button  = $this->former->button('pagination.next')->setAttributes($this->testAttributes)->__toString();
+		$matcher = $this->matchButton('foo', 'Next', array('data-foo' => 'bar'));
+
+		$this->assertHtml($matcher, $button);
+	}
+
+	public function testCanDynamicallyCreateButtons()
+	{
+		$button  = $this->former->large_block_primary_submit('Save')->__toString();
+		$matcher = $this->matchInputButton('btn-large btn-block btn-primary btn', 'Save');
+
+		$this->assertHTML($matcher, $button);
+	}
+
+	public function testCanCreateAResetButton()
+	{
+		$button  = $this->former->large_block_inverse_reset('Reset')->__toString();
+		$matcher = $this->matchInputButton('btn-large btn-block btn-inverse btn', 'Reset', 'reset');
+
+		$this->assertHTML($matcher, $button);
+	}
+
+	public function testCanHaveMultipleInstancesOfAButton()
+	{
+		$multiple = array($this->former->submit('submit'), $this->former->reset('reset'));
+		$multiple = implode(' ', $multiple);
+
+		$matcher1 = $this->matchInputButton('btn', 'Submit', 'submit');
+		$matcher2 = $this->matchInputButton('btn', 'Reset', 'reset');
+
+		$this->assertHTML($matcher1, $multiple);
+		$this->assertHTML($matcher2, $multiple);
+	}
+
+	public function testButtonsAreHtmlObjects()
+	{
+		$button = $this->former->submit('submit');
+		$button->name('foo');
+		$matcher                       = $this->matchInputButton('btn', 'Submit', 'submit');
+		$matcher['attributes']['name'] = 'foo';
+
+		$this->assertHTML($matcher, $button->render());
+	}
+
+	public function testLinksDontHaveTypeAttribute()
+	{
+		$this->former->horizontal_open();
+		$link = $this->former->link('#', 'foo')->__toString();
+		$this->former->close();
+
+		$this->assertEquals('<a href="foo" class="btn">#</a>', $link);
+	}
+
+	public function testCanCreateButtonWithIcon()
+	{
+		$button           = $this->former->button('Save')->icon('save');
+		$matcher          = $this->matchButton('btn', 'Save');
+		$matcher['child'] = array(
+			'tag'        => 'i',
+			'attributes' => array('class' => 'icon-save'),
+		);
+
+		$this->assertHTML($matcher, $button);
+	}
 }
diff --git a/tests/Fields/CheckboxTest.php b/tests/Fields/CheckboxTest.php
index 0dcd87d7..edc4e368 100644
--- a/tests/Fields/CheckboxTest.php
+++ b/tests/Fields/CheckboxTest.php
@@ -7,515 +7,518 @@
 class CheckboxTest extends FormerTests
 {
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Matches a checkbox
-   *
-   * @param  string   $name
-   * @param  string   $label
-   * @param  integer  $value
-   * @param  boolean  $inline
-   * @param  boolean  $checked
-   *
-   * @return string
-   */
-  private function matchCheckbox($name = 'foo', $label = null, $value = 1, $inline = false, $checked = false)
-  {
-    $checkAttr = array(
-      'id'      => $name,
-      'type'    => 'checkbox',
-      'name'    => $name,
-      'checked' => 'checked',
-      'value'   => $value,
-    );
-    $labelAttr = array(
-      'for'   => $name,
-      'class' => 'checkbox',
-    );
-    if ($inline) {
-      $labelAttr['class'] .= $this->former->framework() === 'TwitterBootstrap3' ? ' checkbox-inline' : ' inline';
-    }
-    if (!$checked) unset($checkAttr['checked']);
-
-    $radio = '<input'.$this->attributes($checkAttr).'>';
-
-    return $label ? '<label'.$this->attributes($labelAttr). '>' .$radio.$label. '</label>' : $radio;
-  }
-
-  /**
-   * Matches a checked checkbox
-   *
-   * @param  string  $name
-   * @param  string  $label
-   * @param  integer $value
-   * @param  boolean $inline
-   *
-   * @return string
-   */
-  private function matchCheckedCheckbox($name = 'foo', $label = null, $value = 1, $inline = false)
-  {
-    return $this->matchCheckbox($name, $label, $value, $inline, true);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanCreateASingleCheckedCheckbox()
-  {
-    $checkbox = $this->former->checkbox('foo')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo'));
-
-    $this->assertEquals($matcher, $checkbox);
-  }
-
-  public function testCanCreateACheckboxWithALabel()
-  {
-    $checkbox = $this->former->checkbox('foo')->text('bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo', 'Bar'));
-
-    $this->assertEquals($matcher, $checkbox);
-  }
-
-  public function testCanSetValueOfASingleCheckbox()
-  {
-    $checkbox = $this->former->checkbox('foo')->text('bar')->value('foo')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo', 'Bar', 'foo'));
-
-    $this->assertEquals($matcher, $checkbox);
-  }
-
-  public function testCanCreateMultipleCheckboxes()
-  {
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo').$this->matchCheckbox('foo_1', 'Bar'));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanFocusOnACheckbox()
-  {
-    $checkboxes = $this->former->checkboxes('foo')
-      ->checkboxes('foo', 'bar')
-      ->on(0)->text('first')->on(1)->text('second')->__toString();
-
-    $matcher = $this->controlGroup($this->matchCheckbox('foo_0', 'First').$this->matchCheckbox('foo_1', 'Second'));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanCreateInlineCheckboxes()
-  {
-    $checkboxes1 = $this->former->inline_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
-    $this->resetLabels();
-    $checkboxes2 = $this->former->checkboxes('foo')->inline()->checkboxes('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo', 1, true).$this->matchCheckbox('foo_1', 'Bar', 1, true));
-
-    $this->assertEquals($matcher, $checkboxes1);
-    $this->assertEquals($matcher, $checkboxes2);
-  }
-
-  public function testCanCreateInlineCheckboxesTwitterBootstrap3()
-  {
-    $this->former->framework('TwitterBootstrap3');
-
-    $checkboxes1 = $this->former->inline_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
-    $this->resetLabels();
-    $checkboxes2 = $this->former->checkboxes('foo')->inline()->checkboxes('foo', 'bar')->__toString();
-    $matcher = $this->formGroup($this->matchCheckbox('foo_0', 'Foo', 1, true).$this->matchCheckbox('foo_1', 'Bar', 1, true));
-
-    $this->assertEquals($matcher, $checkboxes1);
-    $this->assertEquals($matcher, $checkboxes2);
-  }
-
-  public function testCanCreateStackedCheckboxes()
-  {
-    $checkboxes1 = $this->former->stacked_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
-    $this->resetLabels();
-    $checkboxes2 = $this->former->checkboxes('foo')->stacked()->checkboxes('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo', 1).$this->matchCheckbox('foo_1', 'Bar', 1));
-
-    $this->assertEquals($matcher, $checkboxes1);
-    $this->assertEquals($matcher, $checkboxes2);
-  }
-
-  public function testCanCreateMultipleCheckboxesViaAnArray()
-  {
-    $this->resetLabels();
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes(array('Foo' => 'foo', 'Bar' => 'bar'))->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo', 'Foo').$this->matchCheckbox('bar', 'Bar'));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanCustomizeCheckboxesViaAnArray()
-  {
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes($this->checkables)->__toString();
-    $matcher = $this->controlGroup(
-    '<label for="foo" class="checkbox">'.
-      '<input data-foo="bar" value="bar" id="foo" type="checkbox" name="foo">'.
-      'Foo'.
-    '</label>'.
-    '<label for="bar" class="checkbox">'.
-      '<input data-foo="bar" value="bar" id="bar" type="checkbox" name="foo">'.
-      'Bar'.
-    '</label>');
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanCreateMultipleAnonymousCheckboxes()
-  {
-    $checkables = $this->checkables;
-    unset($checkables['Foo']['name']);
-    unset($checkables['Bar']['name']);
-
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes($checkables)->__toString();
-    $matcher = $this->controlGroup(
-    '<label for="foo_0" class="checkbox">'.
-      '<input data-foo="bar" value="bar" id="foo_0" type="checkbox" name="foo_0">'.
-      'Foo'.
-    '</label>'.
-    '<label for="bar" class="checkbox">'.
-      '<input data-foo="bar" value="bar" id="bar" type="checkbox" name="foo_1">'.
-      'Bar'.
-    '</label>');
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanCheckASingleCheckbox()
-  {
-    $checkbox = $this->former->checkbox('foo')->check()->__toString();
-    $matcher = $this->controlGroup($this->matchCheckedCheckbox());
-
-    $this->assertEquals($matcher, $checkbox);
-  }
-
-  public function testCanCheckOneInSeveralCheckboxes()
-  {
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->check('foo_1')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo').$this->matchCheckedCheckbox('foo_1', 'Bar'));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanCheckMultipleCheckboxesAtOnce()
-  {
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->check(array('foo_0' => false, 'foo_1' => true))->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo').$this->matchCheckedCheckbox('foo_1', 'Bar', 1));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanRepopulateCheckboxesFromPost()
-  {
-    $this->request->shouldReceive('input')->with('_token', '', true)->andReturn('');
-    $this->request->shouldReceive('input')->with('foo', '', true)->andReturn('');
-    $this->request->shouldReceive('input')->with('foo_0', '', true)->andReturn(true);
-    $this->request->shouldReceive('input')->with('foo_1', '', true)->andReturn(false);
-
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckedCheckbox('foo_0', 'Foo').$this->matchCheckbox('foo_1', 'Bar'));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanPopulateCheckboxesFromAnObject()
-  {
-    $this->former->populate((object) array('foo_0' => true));
-
-    $checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckedCheckbox('foo_0', 'Foo').$this->matchCheckbox('foo_1', 'Bar'));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanPopulateCheckboxesWithRelations()
-  {
-    $eloquent = new DummyEloquent(array('id' => 1, 'name' => 3));
-
-    $this->former->populate($eloquent);
-    $checkboxes = $this->former->checkboxes('roles')->__toString();
-    $matcher = $this->controlGroup(
-      $this->matchCheckbox('1', 'Foo').$this->matchCheckbox('3', 'Bar'),
-      '<label for="roles" class="control-label">Roles</label>');
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testCanDecodeCorrectlyCheckboxes()
-  {
-    $checkbox = $this->former->checkbox('foo')->__toString();
-
-    $content = html_entity_decode($checkbox, ENT_QUOTES, 'UTF-8');
-
-    $this->assertEquals($content, $this->former->checkbox('foo')->__toString());
-  }
-
-  public function testCanPushUncheckedCheckboxes()
-  {
-    $checkbox = $this->former->checkbox('foo')->text('foo')->push(true);
-    $matcher  = $this->controlGroup(
-      '<label for="foo" class="checkbox">'.
-        '<input type="hidden" name="foo" value="">'.
-        $this->matchCheckbox('foo').'Foo'.
-      '</label>');
-
-    $this->assertEquals($matcher, $checkbox->wrapAndRender());
-  }
-
-  public function testCanOverrideGloballyPushedCheckboxes()
-  {
-    $this->mockConfig(array('push_checkboxes' => true));
-    $checkbox = $this->former->checkbox('foo')->text('foo')->push(false);
-
-    $matcher  = $this->controlGroup(
-      '<label for="foo" class="checkbox">'.
-        $this->matchCheckbox('foo').'Foo'.
-      '</label>');
-
-    $this->assertEquals($matcher, $checkbox->wrapAndRender());
-  }
-
-  public function testCanPushASingleCheckbox()
-  {
-    $this->mockConfig(array('push_checkboxes' => true));
-
-    $checkbox = $this->former->checkbox('foo')->text('foo')->__toString();
-    $matcher = $this->controlGroup(
-      '<label for="foo" class="checkbox">'.
-        '<input type="hidden" name="foo" value="">'.
-        $this->matchCheckbox('foo').'Foo'.
-      '</label>');
-
-    $this->assertEquals($matcher, $checkbox);
-  }
-
-  public function testCanRepopulateCheckboxesOnSubmit()
-  {
-    $this->mockConfig(array('push_checkboxes' => true));
-    $this->request->shouldReceive('input')->andReturn('');
-
-    $checkbox = $this->former->checkbox('foo')->text('foo')->__toString();
-    $matcher = $this->controlGroup(
-      '<label for="foo" class="checkbox">'.
-        '<input type="hidden" name="foo" value="">'.
-        $this->matchCheckbox('foo').'Foo'.
-      '</label>');
-
-    $this->assertEquals($matcher, $checkbox);
-  }
-
-  public function testCanGroupCheckboxes()
-  {
-    $this->former->framework('Nude');
-
-    $auto =  $this->former->checkboxes('value[]', '')->checkboxes('Value 01', 'Value 02')->__toString();
-    $chain = $this->former->checkboxes('value', '')->grouped()->checkboxes('Value 01', 'Value 02')->__toString();
-
-    $this->assertEquals($chain, $auto);
-    $this->assertEquals(
-      '<label for="value_0" class="checkbox">'.
-        '<input id="value_0" type="checkbox" name="value[]" value="0">Value 01'.
-      '</label>'.
-      '<label for="value_1" class="checkbox">'.
-        '<input id="value_1" type="checkbox" name="value[]" value="1">Value 02'.
-      '</label>', $auto);
-  }
-
-
-  public function testCanCustomizeGroupedCheckboxes()
-  {
-    $this->former->framework('Nude');
-
-    $checkboxes = array(
-      'Value 01' => array(
-        'id' => 'value[foo_id]',
-        'name' => 'value[foo_name]',
-        'value' => 'foo_value',
-      ),
-      'Value 02' => array(
-        'id' => 'value[bar_id]',
-        'name' => 'value[bar_name]',
-        'value' => 'bar_value',
-      ),
-    );
-
-    $this->former->populate(array('value' => array('foo_name' => 'foo_value')));
-    $auto =  $this->former->checkboxes('value[]', '')->checkboxes($checkboxes)->__toString();
-    $chain = $this->former->checkboxes('value', '')->grouped()->checkboxes($checkboxes)->__toString();
-
-    $this->assertEquals($chain, $auto);
-    $this->assertEquals(
-      '<label for="value[foo_id]" class="checkbox">'.
-        '<input id="value[foo_id]" value="foo_value" type="checkbox" name="value[foo_name]" checked="checked">Value 01'.
-      '</label>'.
-      '<label for="value[bar_id]" class="checkbox">'.
-        '<input id="value[bar_id]" value="bar_value" type="checkbox" name="value[bar_name]">Value 02'.
-      '</label>', $auto);
-  }
-
-  public function testCanRepopulateGroupedCheckboxes()
-  {
-    $this->former->framework('Nude');
-    $this->former->populate(array('foo' => array(0 => 0, 1 => 1)));
-
-    $chain = $this->former->checkboxes('foo', '')->grouped()->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
-    $auto = $this->former->checkboxes('foo[]', '')->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
-
-    $matcher =
-      '<label for="foo_0" class="checkbox">'.
-        '<input id="foo_0" type="checkbox" name="foo[]" checked="checked" value="0">Value 01'.
-      '</label>'.
-      '<label for="foo_1" class="checkbox">'.
-        '<input id="foo_1" type="checkbox" name="foo[]" checked="checked" value="1">Value 02'.
-      '</label>'.
-      '<label for="foo_2" class="checkbox">'.
-        '<input id="foo_2" type="checkbox" name="foo[]" value="2">Value 03'.
-      '</label>';
-
-    $this->assertEquals($matcher, $chain);
-    $this->assertEquals($matcher, $auto);
-  }
-
-  public function testCanRepopulateGroupedCheckboxesFromPost()
-  {
-    $this->former->framework('Nude');
-
-    $this->request->shouldReceive('input')->with('_token', '', true)->andReturn('');
-    $this->request->shouldReceive('input')->with('foo', '', true)->andReturn(
-      array(0 => 0, 1 => 1)
-    );
-
-    $chain = $this->former->checkboxes('foo', '')->grouped()->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
-    $auto = $this->former->checkboxes('foo[]', '')->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
-
-    $matcher =
-      '<label for="foo_0" class="checkbox">'.
-        '<input id="foo_0" type="checkbox" name="foo[]" checked="checked" value="0">Value 01'.
-      '</label>'.
-      '<label for="foo_1" class="checkbox">'.
-        '<input id="foo_1" type="checkbox" name="foo[]" checked="checked" value="1">Value 02'.
-      '</label>'.
-      '<label for="foo_2" class="checkbox">'.
-        '<input id="foo_2" type="checkbox" name="foo[]" value="2">Value 03'.
-      '</label>';
-
-    $this->assertEquals($matcher, $chain);
-    $this->assertEquals($matcher, $auto);
-  }
-
-  public function testCanRepopulateCustomizedGroupedCheckboxesFromPost()
-  {
-    $this->former->framework('Nude');
-
-    $checkboxes = array(
-      'Value 01' => array(
-        'id' => 'value[foo_id]',
-        'name' => 'value[foo_name]',
-        'value' => 'foo_value',
-      ),
-      'Value 02' => array(
-        'id' => 'value[bar_id]',
-        'name' => 'value[bar_name]',
-        'value' => 'bar_value',
-      ),
-    );
-
-    $this->request->shouldReceive('input')->with('_token', '', true)->andReturn('');
-    $this->request->shouldReceive('input')->with('value', '', true)->andReturn(
-      array('foo_name' => 'foo_value')
-    );
-    $auto =  $this->former->checkboxes('value[]', '')->checkboxes($checkboxes)->__toString();
-    $chain = $this->former->checkboxes('value', '')->grouped()->checkboxes($checkboxes)->__toString();
-
-    $this->assertEquals($chain, $auto);
-    $this->assertEquals(
-      '<label for="value[foo_id]" class="checkbox">'.
-        '<input id="value[foo_id]" value="foo_value" type="checkbox" name="value[foo_name]" checked="checked">Value 01'.
-      '</label>'.
-      '<label for="value[bar_id]" class="checkbox">'.
-        '<input id="value[bar_id]" value="bar_value" type="checkbox" name="value[bar_name]">Value 02'.
-      '</label>', $auto);
-  }
-
-  public function testCanCustomizeTheUncheckedValue()
-  {
-    $this->mockConfig(array('unchecked_value' => 'unchecked', 'push_checkboxes' => true));
-
-    $checkbox = $this->former->checkbox('foo')->text('foo')->__toString();
-    $matcher = $this->controlGroup(
-      '<label for="foo" class="checkbox">'.
-        '<input type="hidden" name="foo" value="unchecked">'.
-        $this->matchCheckbox('foo').'Foo'.
-      '</label>');
-
-    $this->assertEquals($matcher, $checkbox);
-  }
-
-  public function testCanRecognizeGroupedCheckboxesValidationErrors()
-  {
-    $this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));
-    $this->former->withErrors();
-
-    $auto =  $this->former->checkboxes('foo[]', '')->checkboxes('Value 01', 'Value 02')->__toString();
-    $chain = $this->former->checkboxes('foo', '')->grouped()->checkboxes('Value 01', 'Value 02')->__toString();
-
-    $matcher =
-      '<div class="control-group error">'.
-      '<div class="controls">'.
-      '<label for="foo_0" class="checkbox">'.
-      '<input id="foo_0" type="checkbox" name="foo[]" value="0">Value 01'.
-      '</label>'.
-      '<label for="foo_1" class="checkbox">'.
-      '<input id="foo_1" type="checkbox" name="foo[]" value="1">Value 02'.
-      '</label>'.
-      '<span class="help-inline">bar</span>'.
-      '</div>'.
-      '</div>';
-
-    $this->assertEquals($matcher, $auto);
-    $this->assertEquals($matcher, $chain);
-  }
-
-  public function testCanHandleAZeroUncheckedValue()
-  {
-    $this->mockConfig(array('unchecked_value' => 0));
-    $checkboxes = $this->former->checkboxes('foo')->value('bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckbox('foo', null, 'bar'));
-
-    $this->assertEquals($matcher, $checkboxes);
-  }
-
-  public function testRepopulatedValueDoesntChangeOriginalValue()
-  {
-    $this->markTestSkipped('Test reformulated proves opposite of that stated');
-
-    $this->former->populate(array('foo' => 'bar'));
-    $checkboxTrue = $this->former->checkbox('foo')->__toString();
-    $matcherTrue = $this->controlGroup($this->matchCheckedCheckbox());
-
-    $this->assertEquals($matcherTrue, $checkboxTrue);
-
-    $this->former->populate(array('foo' => 'baz'));
-    $checkboxFalse = $this->former->checkbox('foo')->__toString();
-    $matcherFalse = $this->controlGroup($this->matchCheckbox());
-
-    $this->assertEquals($matcherFalse, $checkboxFalse);
-  }
-
-  public function testCanPushCheckboxesWithoutLabels()
-  {
-    $this->mockConfig(array('automatic_label' => false, 'push_checkboxes' => true));
-
-    $html  = $this->former->label('<b>Views per Page</b>')->render();
-    $html .= $this->former->checkbox('per_page')->class('input')->render();
-
-    $this->assertInternalType('string', $html);
-  }
-
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Matches a checkbox
+	 *
+	 * @param  string  $name
+	 * @param  string  $label
+	 * @param  integer $value
+	 * @param  boolean $inline
+	 * @param  boolean $checked
+	 *
+	 * @return string
+	 */
+	private function matchCheckbox($name = 'foo', $label = null, $value = 1, $inline = false, $checked = false)
+	{
+		$checkAttr = array(
+			'id'      => $name,
+			'type'    => 'checkbox',
+			'name'    => $name,
+			'checked' => 'checked',
+			'value'   => $value,
+		);
+		$labelAttr = array(
+			'for'   => $name,
+			'class' => 'checkbox',
+		);
+		if ($inline) {
+			$labelAttr['class'] .= $this->former->framework() === 'TwitterBootstrap3' ? ' checkbox-inline' : ' inline';
+		}
+		if (!$checked) {
+			unset($checkAttr['checked']);
+		}
+
+		$radio = '<input'.$this->attributes($checkAttr).'>';
+
+		return $label ? '<label'.$this->attributes($labelAttr).'>'.$radio.$label.'</label>' : $radio;
+	}
+
+	/**
+	 * Matches a checked checkbox
+	 *
+	 * @param  string  $name
+	 * @param  string  $label
+	 * @param  integer $value
+	 * @param  boolean $inline
+	 *
+	 * @return string
+	 */
+	private function matchCheckedCheckbox($name = 'foo', $label = null, $value = 1, $inline = false)
+	{
+		return $this->matchCheckbox($name, $label, $value, $inline, true);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanCreateASingleCheckedCheckbox()
+	{
+		$checkbox = $this->former->checkbox('foo')->__toString();
+		$matcher  = $this->controlGroup($this->matchCheckbox('foo'));
+
+		$this->assertEquals($matcher, $checkbox);
+	}
+
+	public function testCanCreateACheckboxWithALabel()
+	{
+		$checkbox = $this->former->checkbox('foo')->text('bar')->__toString();
+		$matcher  = $this->controlGroup($this->matchCheckbox('foo', 'Bar'));
+
+		$this->assertEquals($matcher, $checkbox);
+	}
+
+	public function testCanSetValueOfASingleCheckbox()
+	{
+		$checkbox = $this->former->checkbox('foo')->text('bar')->value('foo')->__toString();
+		$matcher  = $this->controlGroup($this->matchCheckbox('foo', 'Bar', 'foo'));
+
+		$this->assertEquals($matcher, $checkbox);
+	}
+
+	public function testCanCreateMultipleCheckboxes()
+	{
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
+		$matcher    = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo').$this->matchCheckbox('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanFocusOnACheckbox()
+	{
+		$checkboxes = $this->former->checkboxes('foo')
+		                           ->checkboxes('foo', 'bar')
+		                           ->on(0)->text('first')->on(1)->text('second')->__toString();
+
+		$matcher = $this->controlGroup($this->matchCheckbox('foo_0', 'First').$this->matchCheckbox('foo_1', 'Second'));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanCreateInlineCheckboxes()
+	{
+		$checkboxes1 = $this->former->inline_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$checkboxes2 = $this->former->checkboxes('foo')->inline()->checkboxes('foo', 'bar')->__toString();
+		$matcher     = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo', 1, true).$this->matchCheckbox('foo_1', 'Bar', 1, true));
+
+		$this->assertEquals($matcher, $checkboxes1);
+		$this->assertEquals($matcher, $checkboxes2);
+	}
+
+	public function testCanCreateInlineCheckboxesTwitterBootstrap3()
+	{
+		$this->former->framework('TwitterBootstrap3');
+
+		$checkboxes1 = $this->former->inline_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$checkboxes2 = $this->former->checkboxes('foo')->inline()->checkboxes('foo', 'bar')->__toString();
+		$matcher     = $this->formGroup($this->matchCheckbox('foo_0', 'Foo', 1, true).$this->matchCheckbox('foo_1', 'Bar', 1, true));
+
+		$this->assertEquals($matcher, $checkboxes1);
+		$this->assertEquals($matcher, $checkboxes2);
+	}
+
+	public function testCanCreateStackedCheckboxes()
+	{
+		$checkboxes1 = $this->former->stacked_checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$checkboxes2 = $this->former->checkboxes('foo')->stacked()->checkboxes('foo', 'bar')->__toString();
+		$matcher     = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo', 1).$this->matchCheckbox('foo_1', 'Bar', 1));
+
+		$this->assertEquals($matcher, $checkboxes1);
+		$this->assertEquals($matcher, $checkboxes2);
+	}
+
+	public function testCanCreateMultipleCheckboxesViaAnArray()
+	{
+		$this->resetLabels();
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes(array('Foo' => 'foo', 'Bar' => 'bar'))->__toString();
+		$matcher    = $this->controlGroup($this->matchCheckbox('foo', 'Foo').$this->matchCheckbox('bar', 'Bar'));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanCustomizeCheckboxesViaAnArray()
+	{
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes($this->checkables)->__toString();
+		$matcher    = $this->controlGroup(
+			'<label for="foo" class="checkbox">'.
+			'<input data-foo="bar" value="bar" id="foo" type="checkbox" name="foo">'.
+			'Foo'.
+			'</label>'.
+			'<label for="bar" class="checkbox">'.
+			'<input data-foo="bar" value="bar" id="bar" type="checkbox" name="foo">'.
+			'Bar'.
+			'</label>');
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanCreateMultipleAnonymousCheckboxes()
+	{
+		$checkables = $this->checkables;
+		unset($checkables['Foo']['name']);
+		unset($checkables['Bar']['name']);
+
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes($checkables)->__toString();
+		$matcher    = $this->controlGroup(
+			'<label for="foo_0" class="checkbox">'.
+			'<input data-foo="bar" value="bar" id="foo_0" type="checkbox" name="foo_0">'.
+			'Foo'.
+			'</label>'.
+			'<label for="bar" class="checkbox">'.
+			'<input data-foo="bar" value="bar" id="bar" type="checkbox" name="foo_1">'.
+			'Bar'.
+			'</label>');
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanCheckASingleCheckbox()
+	{
+		$checkbox = $this->former->checkbox('foo')->check()->__toString();
+		$matcher  = $this->controlGroup($this->matchCheckedCheckbox());
+
+		$this->assertEquals($matcher, $checkbox);
+	}
+
+	public function testCanCheckOneInSeveralCheckboxes()
+	{
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->check('foo_1')->__toString();
+		$matcher    = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo').$this->matchCheckedCheckbox('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanCheckMultipleCheckboxesAtOnce()
+	{
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->check(array(
+				'foo_0' => false,
+				'foo_1' => true
+			))->__toString();
+		$matcher    = $this->controlGroup($this->matchCheckbox('foo_0', 'Foo').$this->matchCheckedCheckbox('foo_1', 'Bar', 1));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanRepopulateCheckboxesFromPost()
+	{
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('');
+		$this->request->shouldReceive('input')->with('foo', '', true)->andReturn('');
+		$this->request->shouldReceive('input')->with('foo_0', '', true)->andReturn(true);
+		$this->request->shouldReceive('input')->with('foo_1', '', true)->andReturn(false);
+
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
+		$matcher    = $this->controlGroup($this->matchCheckedCheckbox('foo_0', 'Foo').$this->matchCheckbox('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanPopulateCheckboxesFromAnObject()
+	{
+		$this->former->populate((object) array('foo_0' => true));
+
+		$checkboxes = $this->former->checkboxes('foo')->checkboxes('foo', 'bar')->__toString();
+		$matcher    = $this->controlGroup($this->matchCheckedCheckbox('foo_0', 'Foo').$this->matchCheckbox('foo_1', 'Bar'));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanPopulateCheckboxesWithRelations()
+	{
+		$eloquent = new DummyEloquent(array('id' => 1, 'name' => 3));
+
+		$this->former->populate($eloquent);
+		$checkboxes = $this->former->checkboxes('roles')->__toString();
+		$matcher    = $this->controlGroup(
+			$this->matchCheckbox('1', 'Foo').$this->matchCheckbox('3', 'Bar'),
+			'<label for="roles" class="control-label">Roles</label>');
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testCanDecodeCorrectlyCheckboxes()
+	{
+		$checkbox = $this->former->checkbox('foo')->__toString();
+
+		$content = html_entity_decode($checkbox, ENT_QUOTES, 'UTF-8');
+
+		$this->assertEquals($content, $this->former->checkbox('foo')->__toString());
+	}
+
+	public function testCanPushUncheckedCheckboxes()
+	{
+		$checkbox = $this->former->checkbox('foo')->text('foo')->push(true);
+		$matcher  = $this->controlGroup(
+			'<label for="foo" class="checkbox">'.
+			'<input type="hidden" name="foo" value="">'.
+			$this->matchCheckbox('foo').'Foo'.
+			'</label>');
+
+		$this->assertEquals($matcher, $checkbox->wrapAndRender());
+	}
+
+	public function testCanOverrideGloballyPushedCheckboxes()
+	{
+		$this->mockConfig(array('push_checkboxes' => true));
+		$checkbox = $this->former->checkbox('foo')->text('foo')->push(false);
+
+		$matcher = $this->controlGroup(
+			'<label for="foo" class="checkbox">'.
+			$this->matchCheckbox('foo').'Foo'.
+			'</label>');
+
+		$this->assertEquals($matcher, $checkbox->wrapAndRender());
+	}
+
+	public function testCanPushASingleCheckbox()
+	{
+		$this->mockConfig(array('push_checkboxes' => true));
+
+		$checkbox = $this->former->checkbox('foo')->text('foo')->__toString();
+		$matcher  = $this->controlGroup(
+			'<label for="foo" class="checkbox">'.
+			'<input type="hidden" name="foo" value="">'.
+			$this->matchCheckbox('foo').'Foo'.
+			'</label>');
+
+		$this->assertEquals($matcher, $checkbox);
+	}
+
+	public function testCanRepopulateCheckboxesOnSubmit()
+	{
+		$this->mockConfig(array('push_checkboxes' => true));
+		$this->request->shouldReceive('input')->andReturn('');
+
+		$checkbox = $this->former->checkbox('foo')->text('foo')->__toString();
+		$matcher  = $this->controlGroup(
+			'<label for="foo" class="checkbox">'.
+			'<input type="hidden" name="foo" value="">'.
+			$this->matchCheckbox('foo').'Foo'.
+			'</label>');
+
+		$this->assertEquals($matcher, $checkbox);
+	}
+
+	public function testCanGroupCheckboxes()
+	{
+		$this->former->framework('Nude');
+
+		$auto  = $this->former->checkboxes('value[]', '')->checkboxes('Value 01', 'Value 02')->__toString();
+		$chain = $this->former->checkboxes('value', '')->grouped()->checkboxes('Value 01', 'Value 02')->__toString();
+
+		$this->assertEquals($chain, $auto);
+		$this->assertEquals(
+			'<label for="value_0" class="checkbox">'.
+			'<input id="value_0" type="checkbox" name="value[]" value="0">Value 01'.
+			'</label>'.
+			'<label for="value_1" class="checkbox">'.
+			'<input id="value_1" type="checkbox" name="value[]" value="1">Value 02'.
+			'</label>', $auto);
+	}
+
+	public function testCanCustomizeGroupedCheckboxes()
+	{
+		$this->former->framework('Nude');
+
+		$checkboxes = array(
+			'Value 01' => array(
+				'id'    => 'value[foo_id]',
+				'name'  => 'value[foo_name]',
+				'value' => 'foo_value',
+			),
+			'Value 02' => array(
+				'id'    => 'value[bar_id]',
+				'name'  => 'value[bar_name]',
+				'value' => 'bar_value',
+			),
+		);
+
+		$this->former->populate(array('value' => array('foo_name' => 'foo_value')));
+		$auto  = $this->former->checkboxes('value[]', '')->checkboxes($checkboxes)->__toString();
+		$chain = $this->former->checkboxes('value', '')->grouped()->checkboxes($checkboxes)->__toString();
+
+		$this->assertEquals($chain, $auto);
+		$this->assertEquals(
+			'<label for="value[foo_id]" class="checkbox">'.
+			'<input id="value[foo_id]" value="foo_value" type="checkbox" name="value[foo_name]" checked="checked">Value 01'.
+			'</label>'.
+			'<label for="value[bar_id]" class="checkbox">'.
+			'<input id="value[bar_id]" value="bar_value" type="checkbox" name="value[bar_name]">Value 02'.
+			'</label>', $auto);
+	}
+
+	public function testCanRepopulateGroupedCheckboxes()
+	{
+		$this->former->framework('Nude');
+		$this->former->populate(array('foo' => array(0 => 0, 1 => 1)));
+
+		$chain = $this->former->checkboxes('foo', '')->grouped()->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
+		$auto  = $this->former->checkboxes('foo[]', '')->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
+
+		$matcher =
+			'<label for="foo_0" class="checkbox">'.
+			'<input id="foo_0" type="checkbox" name="foo[]" checked="checked" value="0">Value 01'.
+			'</label>'.
+			'<label for="foo_1" class="checkbox">'.
+			'<input id="foo_1" type="checkbox" name="foo[]" checked="checked" value="1">Value 02'.
+			'</label>'.
+			'<label for="foo_2" class="checkbox">'.
+			'<input id="foo_2" type="checkbox" name="foo[]" value="2">Value 03'.
+			'</label>';
+
+		$this->assertEquals($matcher, $chain);
+		$this->assertEquals($matcher, $auto);
+	}
+
+	public function testCanRepopulateGroupedCheckboxesFromPost()
+	{
+		$this->former->framework('Nude');
+
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('');
+		$this->request->shouldReceive('input')->with('foo', '', true)->andReturn(
+			array(0 => 0, 1 => 1)
+		);
+
+		$chain = $this->former->checkboxes('foo', '')->grouped()->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
+		$auto  = $this->former->checkboxes('foo[]', '')->checkboxes('Value 01', 'Value 02', 'Value 03')->__toString();
+
+		$matcher =
+			'<label for="foo_0" class="checkbox">'.
+			'<input id="foo_0" type="checkbox" name="foo[]" checked="checked" value="0">Value 01'.
+			'</label>'.
+			'<label for="foo_1" class="checkbox">'.
+			'<input id="foo_1" type="checkbox" name="foo[]" checked="checked" value="1">Value 02'.
+			'</label>'.
+			'<label for="foo_2" class="checkbox">'.
+			'<input id="foo_2" type="checkbox" name="foo[]" value="2">Value 03'.
+			'</label>';
+
+		$this->assertEquals($matcher, $chain);
+		$this->assertEquals($matcher, $auto);
+	}
+
+	public function testCanRepopulateCustomizedGroupedCheckboxesFromPost()
+	{
+		$this->former->framework('Nude');
+
+		$checkboxes = array(
+			'Value 01' => array(
+				'id'    => 'value[foo_id]',
+				'name'  => 'value[foo_name]',
+				'value' => 'foo_value',
+			),
+			'Value 02' => array(
+				'id'    => 'value[bar_id]',
+				'name'  => 'value[bar_name]',
+				'value' => 'bar_value',
+			),
+		);
+
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('');
+		$this->request->shouldReceive('input')->with('value', '', true)->andReturn(
+			array('foo_name' => 'foo_value')
+		);
+		$auto  = $this->former->checkboxes('value[]', '')->checkboxes($checkboxes)->__toString();
+		$chain = $this->former->checkboxes('value', '')->grouped()->checkboxes($checkboxes)->__toString();
+
+		$this->assertEquals($chain, $auto);
+		$this->assertEquals(
+			'<label for="value[foo_id]" class="checkbox">'.
+			'<input id="value[foo_id]" value="foo_value" type="checkbox" name="value[foo_name]" checked="checked">Value 01'.
+			'</label>'.
+			'<label for="value[bar_id]" class="checkbox">'.
+			'<input id="value[bar_id]" value="bar_value" type="checkbox" name="value[bar_name]">Value 02'.
+			'</label>', $auto);
+	}
+
+	public function testCanCustomizeTheUncheckedValue()
+	{
+		$this->mockConfig(array('unchecked_value' => 'unchecked', 'push_checkboxes' => true));
+
+		$checkbox = $this->former->checkbox('foo')->text('foo')->__toString();
+		$matcher  = $this->controlGroup(
+			'<label for="foo" class="checkbox">'.
+			'<input type="hidden" name="foo" value="unchecked">'.
+			$this->matchCheckbox('foo').'Foo'.
+			'</label>');
+
+		$this->assertEquals($matcher, $checkbox);
+	}
+
+	public function testCanRecognizeGroupedCheckboxesValidationErrors()
+	{
+		$this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));
+		$this->former->withErrors();
+
+		$auto  = $this->former->checkboxes('foo[]', '')->checkboxes('Value 01', 'Value 02')->__toString();
+		$chain = $this->former->checkboxes('foo', '')->grouped()->checkboxes('Value 01', 'Value 02')->__toString();
+
+		$matcher =
+			'<div class="control-group error">'.
+			'<div class="controls">'.
+			'<label for="foo_0" class="checkbox">'.
+			'<input id="foo_0" type="checkbox" name="foo[]" value="0">Value 01'.
+			'</label>'.
+			'<label for="foo_1" class="checkbox">'.
+			'<input id="foo_1" type="checkbox" name="foo[]" value="1">Value 02'.
+			'</label>'.
+			'<span class="help-inline">bar</span>'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $auto);
+		$this->assertEquals($matcher, $chain);
+	}
+
+	public function testCanHandleAZeroUncheckedValue()
+	{
+		$this->mockConfig(array('unchecked_value' => 0));
+		$checkboxes = $this->former->checkboxes('foo')->value('bar')->__toString();
+		$matcher    = $this->controlGroup($this->matchCheckbox('foo', null, 'bar'));
+
+		$this->assertEquals($matcher, $checkboxes);
+	}
+
+	public function testRepopulatedValueDoesntChangeOriginalValue()
+	{
+		$this->markTestSkipped('Test reformulated proves opposite of that stated');
+
+		$this->former->populate(array('foo' => 'bar'));
+		$checkboxTrue = $this->former->checkbox('foo')->__toString();
+		$matcherTrue  = $this->controlGroup($this->matchCheckedCheckbox());
+
+		$this->assertEquals($matcherTrue, $checkboxTrue);
+
+		$this->former->populate(array('foo' => 'baz'));
+		$checkboxFalse = $this->former->checkbox('foo')->__toString();
+		$matcherFalse  = $this->controlGroup($this->matchCheckbox());
+
+		$this->assertEquals($matcherFalse, $checkboxFalse);
+	}
+
+	public function testCanPushCheckboxesWithoutLabels()
+	{
+		$this->mockConfig(array('automatic_label' => false, 'push_checkboxes' => true));
+
+		$html = $this->former->label('<b>Views per Page</b>')->render();
+		$html .= $this->former->checkbox('per_page')->class('input')->render();
+
+		$this->assertInternalType('string', $html);
+	}
 }
diff --git a/tests/Fields/FileTest.php b/tests/Fields/FileTest.php
index 7e8676e6..ed24fbbd 100644
--- a/tests/Fields/FileTest.php
+++ b/tests/Fields/FileTest.php
@@ -6,122 +6,124 @@
 class FileTest extends FormerTests
 {
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function matchFile($accept = null)
-  {
-    $file = array(
-      'tag' => 'input',
-      'id' => 'foo',
-      'attributes' => array(
-        'type' => 'file',
-        'name' => 'foo',
-      ),
-    );
-
-    if ($accept) $file['attributes']['accept'] = $accept;
-    return $file;
-  }
-
-  public function matchFiles()
-  {
-    return array(
-      'tag' => 'input',
-      'id' => 'foo[]',
-      'attributes' => array(
-        'type' => 'file',
-        'multiple' => true,
-        'name' => 'foo[]',
-      ),
-    );
-  }
-
-  public function matchHidden($size)
-  {
-    return array(
-      'tag' => 'input',
-      'attributes' => array(
-        'type' => 'hidden',
-        'name' => 'MAX_FILE_SIZE',
-        'value' => $size,
-      ),
-    );
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanCreateAFileField()
-  {
-    $file = $this->former->file('foo')->__toString();
-
-    $this->assertControlGroup($file);
-    $this->assertHTML($this->matchFile(), $file);
-  }
-
-  public function testCanCreateAMultipleFilesField()
-  {
-    $file = $this->former->files('foo')->__toString();
-
-    $this->assertLabel($file, 'foo[]');
-    $this->assertHTML($this->matchControlGroup(), $file);
-    $this->assertHTML($this->matchFiles(), $file);
-  }
-
-  public function testCanCustomizeAcceptedFormats()
-  {
-    $file = $this->former->file('foo')->accept('video', 'image', 'audio', 'jpeg', 'image/gif')->__toString();
-
-    $this->assertControlGroup($file);
-    $this->assertHTML($this->matchFile('video/*|image/*|audio/*|image/jpeg|image/gif'), $file);
-  }
-
-  public function testCanSetMaxSizeInKilobytes()
-  {
-    $file = $this->former->file('foo')->max(1, 'KB')->__toString();
-
-    $this->assertControlGroup($file);
-    $this->assertHTML($this->matchFile(), $file);
-    $this->assertHTML($this->matchHidden('1024'), $file);
-  }
-
-  public function testCanSetMaxSizeInMegabytes()
-  {
-    $file = $this->former->file('foo')->max(2, 'MB')->__toString();
-
-    $this->assertControlGroup($file);
-    $this->assertHTML($this->matchFile(), $file);
-    $this->assertHTML($this->matchHidden('2097152'), $file);
-  }
-
-  public function testCanSetMaxSizeInGigabytes()
-  {
-    $file = $this->former->file('foo')->max(1, 'GB')->__toString();
-
-    $this->assertControlGroup($file);
-    $this->assertHTML($this->matchFile(), $file);
-    $this->assertHTML($this->matchHidden('1073741824'), $file);
-  }
-
-  public function testCanSetMaxSizeInBits()
-  {
-    $file = $this->former->file('foo')->max(1, 'Mb')->__toString();
-
-    $this->assertControlGroup($file);
-    $this->assertHTML($this->matchFile(), $file);
-    $this->assertHTML($this->matchHidden('131072'), $file);
-  }
-
-  public function testCanSetMaxSizeInOctets()
-  {
-    $file = $this->former->file('foo')->max(2, 'Mo')->__toString();
-
-    $this->assertControlGroup($file);
-    $this->assertHTML($this->matchFile(), $file);
-    $this->assertHTML($this->matchHidden('2097152'), $file);
-  }
-
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function matchFile($accept = null)
+	{
+		$file = array(
+			'tag'        => 'input',
+			'id'         => 'foo',
+			'attributes' => array(
+				'type' => 'file',
+				'name' => 'foo',
+			),
+		);
+
+		if ($accept) {
+			$file['attributes']['accept'] = $accept;
+		}
+
+		return $file;
+	}
+
+	public function matchFiles()
+	{
+		return array(
+			'tag'        => 'input',
+			'id'         => 'foo[]',
+			'attributes' => array(
+				'type'     => 'file',
+				'multiple' => true,
+				'name'     => 'foo[]',
+			),
+		);
+	}
+
+	public function matchHidden($size)
+	{
+		return array(
+			'tag'        => 'input',
+			'attributes' => array(
+				'type'  => 'hidden',
+				'name'  => 'MAX_FILE_SIZE',
+				'value' => $size,
+			),
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanCreateAFileField()
+	{
+		$file = $this->former->file('foo')->__toString();
+
+		$this->assertControlGroup($file);
+		$this->assertHTML($this->matchFile(), $file);
+	}
+
+	public function testCanCreateAMultipleFilesField()
+	{
+		$file = $this->former->files('foo')->__toString();
+
+		$this->assertLabel($file, 'foo[]');
+		$this->assertHTML($this->matchControlGroup(), $file);
+		$this->assertHTML($this->matchFiles(), $file);
+	}
+
+	public function testCanCustomizeAcceptedFormats()
+	{
+		$file = $this->former->file('foo')->accept('video', 'image', 'audio', 'jpeg', 'image/gif')->__toString();
+
+		$this->assertControlGroup($file);
+		$this->assertHTML($this->matchFile('video/*|image/*|audio/*|image/jpeg|image/gif'), $file);
+	}
+
+	public function testCanSetMaxSizeInKilobytes()
+	{
+		$file = $this->former->file('foo')->max(1, 'KB')->__toString();
+
+		$this->assertControlGroup($file);
+		$this->assertHTML($this->matchFile(), $file);
+		$this->assertHTML($this->matchHidden('1024'), $file);
+	}
+
+	public function testCanSetMaxSizeInMegabytes()
+	{
+		$file = $this->former->file('foo')->max(2, 'MB')->__toString();
+
+		$this->assertControlGroup($file);
+		$this->assertHTML($this->matchFile(), $file);
+		$this->assertHTML($this->matchHidden('2097152'), $file);
+	}
+
+	public function testCanSetMaxSizeInGigabytes()
+	{
+		$file = $this->former->file('foo')->max(1, 'GB')->__toString();
+
+		$this->assertControlGroup($file);
+		$this->assertHTML($this->matchFile(), $file);
+		$this->assertHTML($this->matchHidden('1073741824'), $file);
+	}
+
+	public function testCanSetMaxSizeInBits()
+	{
+		$file = $this->former->file('foo')->max(1, 'Mb')->__toString();
+
+		$this->assertControlGroup($file);
+		$this->assertHTML($this->matchFile(), $file);
+		$this->assertHTML($this->matchHidden('131072'), $file);
+	}
+
+	public function testCanSetMaxSizeInOctets()
+	{
+		$file = $this->former->file('foo')->max(2, 'Mo')->__toString();
+
+		$this->assertControlGroup($file);
+		$this->assertHTML($this->matchFile(), $file);
+		$this->assertHTML($this->matchHidden('2097152'), $file);
+	}
 }
diff --git a/tests/Fields/HiddenTest.php b/tests/Fields/HiddenTest.php
index 0f897886..258c0967 100644
--- a/tests/Fields/HiddenTest.php
+++ b/tests/Fields/HiddenTest.php
@@ -3,29 +3,27 @@
 
 use Former\TestCases\FormerTests;
 
-
 class HiddenTest extends FormerTests
 {
 
-  public function testCanCreateHiddenField()
-  {
-    $input   = $this->former->hidden('foo')->value('bar')->__toString();
-    $matcher = $this->matchField(array(), 'hidden');
-    $field   = array_except($matcher, 'id');
-
-    $this->assertHTML($field, $input);
-  }
+	public function testCanCreateHiddenField()
+	{
+		$input   = $this->former->hidden('foo')->value('bar')->__toString();
+		$matcher = $this->matchField(array(), 'hidden');
+		$field   = array_except($matcher, 'id');
 
-  public function testCanPopulateHiddenFields()
-  {
-    $this->former->populate(array('foo' => 'bar'));
+		$this->assertHTML($field, $input);
+	}
 
-    $input   = $this->former->hidden('foo')->value('bis')->__toString();
-    $matcher = $this->matchField(array(), 'hidden');
-    $field   = array_except($matcher, 'id');
-    $field['attributes']['value'] = 'bar';
+	public function testCanPopulateHiddenFields()
+	{
+		$this->former->populate(array('foo' => 'bar'));
 
-    $this->assertHTML($field, $input);
-  }
+		$input                        = $this->former->hidden('foo')->value('bis')->__toString();
+		$matcher                      = $this->matchField(array(), 'hidden');
+		$field                        = array_except($matcher, 'id');
+		$field['attributes']['value'] = 'bar';
 
+		$this->assertHTML($field, $input);
+	}
 }
diff --git a/tests/Fields/InputTest.php b/tests/Fields/InputTest.php
index 87592a3d..c28cd809 100644
--- a/tests/Fields/InputTest.php
+++ b/tests/Fields/InputTest.php
@@ -1,294 +1,298 @@
 <?php
 namespace Former\Fields;
 
-use Former\TestCases\FormerTests;
 use Former\Dummy\DummyEloquent;
-
+use Former\TestCases\FormerTests;
 
 class InputTest extends FormerTests
 {
-  public function testCanCreateText()
-  {
-    $input = $this->former->text('foo')->__toString();
-
-    $this->assertControlGroup($input);
-    $this->assertHTML($this->matchField(), $input);
-  }
-
-  public function testCanCreateTextWithoutLabel()
-  {
-    $this->mockConfig(array('automatic_label' => false));
-
-    $input = $this->former->text('foo')->__toString();
-    $matchField = array_except($this->matchField(), 'id');
-
-    $this->assertHTML($this->matchControlGroup(), $input);
-    $this->assertHTML($matchField, $input);
-  }
-
-  public function testCanCreateSingleTextWithoutLabelOnStart()
-  {
-    $input = $this->former->text('foo', '')->__toString();
-    $matchField = array_except($this->matchField(), 'id');
-
-    $this->assertHTML($this->matchControlGroup(), $input);
-    $this->assertHTML($matchField, $input);
-  }
-
-  public function testCanCreateSingleTextWithoutLabel()
-  {
-    $input = $this->former->text('foo')->label(null)->__toString();
-    $matchField = array_except($this->matchField(), 'id');
-
-    $this->assertHTML($this->matchControlGroup(), $input);
-    $this->assertHTML($matchField, $input);
-  }
-
-  public function testCanCreateSearchField()
-  {
-    $input = $this->former->search('foo')->__toString();
-    $matchField = $this->matchField();
-    array_set($matchField, 'attributes.class', 'search-query');
-
-    $this->assertControlGroup($input);
-    $this->assertHTML($matchField, $input);
-  }
-
-  public function testCanCreateTextFieldWithoutBootstrap()
-  {
-    $this->former->framework('Nude');
-
-    $input = $this->former->text('foo')->data('foo')->class('bar')->__toString();
-    $label = $this->matchLabel('Foo');
-    array_forget($label, 'attributes.class');
-
-    $this->assertHTML($label, $input);
-    $this->assertHTML($this->matchField(), $input);
-  }
-
-  public function testCanCreateTextFieldWithoutFormInstance()
-  {
-    $this->former->close();
-
-    $input = $this->former->text('foo')->data('foo')->class('bar')->__toString();
-
-    $label = array('tag' => 'label', 'content' => 'Foo', array('for' => 'foo'));
-    $this->assertHTML($label, $input);
-    $this->assertHTML($this->matchField(), $input);
-
-    $this->former->horizontal_open();
-  }
-
-  public function testCanCreateTextLabel()
-  {
-    $static  = $this->former->text('foo')->label('bar', $this->testAttributes)->__toString();
-    $label = $this->matchLabel('Bar', 'foo');
-    $label['attributes']['class'] = 'foo control-label';
-    $label['attributes']['data-foo'] = 'bar';
-    $this->assertHTML($label, $static);
-    $this->assertHTML($this->matchField(), $static);
-    $this->assertHTML($this->matchControlGroup(), $static);
-
-    $this->resetLabels();
-    $input = $this->former->text('foo', 'bar')->__toString();
-    $this->assertHTML($this->matchLabel('Bar', 'foo'), $input);
-    $this->assertHTML($this->matchField(), $input);
-    $this->assertHTML($this->matchControlGroup(), $input);
-  }
-
-  public function testCanCreateTextLabelWithoutBootstrap()
-  {
-    $this->former->framework('Nude');
-
-    $static = $this->former->text('foo')->label('bar', $this->testAttributes)->__toString();
-    $label = $this->matchLabel('Bar');
-    $label['attributes']['class'] = 'foo';
-    $label['attributes']['data-foo'] = 'bar';
-    $this->assertHTML($label, $static);
-    $this->assertHTML($this->matchField(), $static);
-
-    $input  = $this->former->text('foo', 'bar')->__toString();
-    $label = $this->matchLabel('Bar');
-    unset($label['attributes']['class']);
-    $this->assertHTML($label, $static);
-    $this->assertHTML($this->matchField(), $static);
-  }
-
-  public function testCanCreateWithErrors()
-  {
-    $this->former->withErrors($this->validator);
-
-    $required = $this->former->text('required')->__toString();
-    $matcher =
-    '<div class="control-group error">'.
-      '<label for="required" class="control-label">Required</label>'.
-      '<div class="controls">'.
-        '<input id="required" type="text" name="required">'.
-        '<span class="help-inline">The required field is required.</span>'.
-      '</div>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $required);
-  }
-
-  public function testAnonymousFieldHasNoErrors()
-  {
-    $this->former->withErrors($this->validator);
-
-    $required = $this->former->text()->__toString();
-    $matcher =
-    '<div class="control-group">'.
-      '<div class="controls">'.
-        '<input type="text">'.
-      '</div>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $required);
-  }
-
-  public function testCanDisableErrors()
-  {
-    $this->mockConfig(array('error_messages' => false));
-    $this->former->withErrors($this->validator);
-
-    $required = $this->former->text('required')->__toString();
-    $matcher =
-    '<div class="control-group error">'.
-      '<label for="required" class="control-label">Required</label>'.
-      '<div class="controls">'.
-        '<input id="required" type="text" name="required">'.
-      '</div>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $required);
-  }
-
-  public function testCanCreatePopulate()
-  {
-    $this->former->populate(array('foo' => 'bar'));
-
-    $populate = $this->former->text('foo')->__toString();
-    $matcher = $this->controlGroup('<input id="foo" type="text" name="foo" value="bar">');
-
-    $this->assertEquals($matcher, $populate);
-  }
-
-  public function testCanCreatePopulateWithSpecificValue()
-  {
-    $this->former->populate(array('foo' => 'bar'));
-    $this->former->populateField('foo', 'foo');
-
-    $populate = $this->former->text('foo')->__toString();
-    $matcher = $this->controlGroup('<input id="foo" type="text" name="foo" value="foo">');
-
-    $this->assertEquals($matcher, $populate);
-  }
-
-  public function testCanCreateNestedRelationships()
-  {
-    $foo = (object) array('bar' => (object) array('kal' => (object) array('ter' => 'men')));
-    $this->former->populate($foo);
-
-    $text = $this->former->text('bar.kal.ter')->__toString();
-    $matcher = $this->controlGroup(
-      '<input id="bar.kal.ter" type="text" name="bar.kal.ter" value="men">',
-      '<label for="bar.kal.ter" class="control-label">Bar.kal.ter</label>');
-
-    $this->assertEquals($matcher, $text);
-  }
-
-  public function testCanCreateNestedRelationshipsRenamedField()
-  {
-    $foo = (object) array('bar' => (object) array('kal' => (object) array('ter' => 'men')));
-    $this->former->populate($foo);
-
-    $text = $this->former->text('bar.kal.ter')->name('ter')->__toString();
-    $matcher = $this->controlGroup(
-      '<input id="ter" type="text" name="ter" value="men">',
-      '<label for="ter" class="control-label">Ter</label>');
-
-    $this->assertEquals($matcher, $text);
-  }
-
-  public function testCanCreateMultipleNestedRelationships()
-  {
-    for($i = 0; $i < 2; $i++) $bar[] = (object) array('kal' => 'val'.$i);
-    $foo = (object) array('bar' => $bar);
-    $this->former->populate($foo);
-
-    $text = $this->former->text('bar.kal')->__toString();
-    $matcher = $this->controlGroup(
-      '<input id="bar.kal" type="text" name="bar.kal" value="val0, val1">',
-      '<label for="bar.kal" class="control-label">Bar.kal</label>');
-
-    $this->assertEquals($matcher, $text);
-  }
-
-  public function testCanCreateNoPopulatingPasswords()
-  {
-    $this->former->populate(array('foo' => 'bar'));
-    $populate = $this->former->password('foo')->__toString();
-    $matcher = $this->controlGroup('<input id="foo" type="password" name="foo">');
-
-    $this->assertEquals($matcher, $populate);
-  }
-
-  public function testCanCreateDatalist()
-  {
-    $datalist = $this->former->text('foo')->useDatalist(array('foo' => 'bar', 'kel' => 'tar'))->__toString();
-    $matcher =
-    '<div class="control-group">'.
-      '<label for="foo" class="control-label">Foo</label>'.
-      '<div class="controls">'.
-        '<input list="datalist_foo" id="foo" type="text" name="foo">'.
-        '<datalist id="datalist_foo">'.
-          '<option value="bar">foo</option>'.
-          '<option value="tar">kel</option>'.
-        '</datalist>'.
-      '</div>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $datalist);
-  }
-
-  public function testCanCreateDatalistCustomList()
-  {
-    $datalist = $this->former->text('foo')->list('bar')->useDatalist(array('foo' => 'bar', 'kel' => 'tar'))->__toString();
-    $matcher =
-    '<div class="control-group">'.
-      '<label for="foo" class="control-label">Foo</label>'.
-      '<div class="controls">'.
-        '<input list="bar" id="foo" type="text" name="foo">'.
-        '<datalist id="bar">'.
-          '<option value="bar">foo</option>'.
-          '<option value="tar">kel</option>'.
-        '</datalist>'.
-      '</div>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $datalist);
-  }
-
-  public function testCanCreateNumberRange()
-  {
-    $range = $this->former->number('foo')->range(1, 5)->__toString();
-
-    $this->assertContains('min="1" max="5"', $range);
-  }
-
-  public function testLabelCastsToString()
-  {
-    $object = new DummyEloquent(array('name' => 'Bar'));
-
-    $static  = $this->former->checkbox('foo')->label($object)->__toString();
-    $label = $this->matchLabel('Bar', 'foo');
-    $this->assertHTML($label, $static);
-  }
-
-  public function testUnderscoresInLabelsAreConverted()
-  {
-    $static  = $this->former->text('foo')->label('customer_name')->__toString();
-    $label = $this->matchLabel('Customer name', 'foo');
-    $this->assertHTML($label, $static);
-  }
+	public function testCanCreateText()
+	{
+		$input = $this->former->text('foo')->__toString();
+
+		$this->assertControlGroup($input);
+		$this->assertHTML($this->matchField(), $input);
+	}
+
+	public function testCanCreateTextWithoutLabel()
+	{
+		$this->mockConfig(array('automatic_label' => false));
+
+		$input      = $this->former->text('foo')->__toString();
+		$matchField = array_except($this->matchField(), 'id');
+
+		$this->assertHTML($this->matchControlGroup(), $input);
+		$this->assertHTML($matchField, $input);
+	}
+
+	public function testCanCreateSingleTextWithoutLabelOnStart()
+	{
+		$input      = $this->former->text('foo', '')->__toString();
+		$matchField = array_except($this->matchField(), 'id');
+
+		$this->assertHTML($this->matchControlGroup(), $input);
+		$this->assertHTML($matchField, $input);
+	}
+
+	public function testCanCreateSingleTextWithoutLabel()
+	{
+		$input      = $this->former->text('foo')->label(null)->__toString();
+		$matchField = array_except($this->matchField(), 'id');
+
+		$this->assertHTML($this->matchControlGroup(), $input);
+		$this->assertHTML($matchField, $input);
+	}
+
+	public function testCanCreateSearchField()
+	{
+		$input      = $this->former->search('foo')->__toString();
+		$matchField = $this->matchField();
+		array_set($matchField, 'attributes.class', 'search-query');
+
+		$this->assertControlGroup($input);
+		$this->assertHTML($matchField, $input);
+	}
+
+	public function testCanCreateTextFieldWithoutBootstrap()
+	{
+		$this->former->framework('Nude');
+
+		$input = $this->former->text('foo')->data('foo')->class('bar')->__toString();
+		$label = $this->matchLabel('Foo');
+		array_forget($label, 'attributes.class');
+
+		$this->assertHTML($label, $input);
+		$this->assertHTML($this->matchField(), $input);
+	}
+
+	public function testCanCreateTextFieldWithoutFormInstance()
+	{
+		$this->former->close();
+
+		$input = $this->former->text('foo')->data('foo')->class('bar')->__toString();
+
+		$label = array('tag' => 'label', 'content' => 'Foo', array('for' => 'foo'));
+		$this->assertHTML($label, $input);
+		$this->assertHTML($this->matchField(), $input);
+
+		$this->former->horizontal_open();
+	}
+
+	public function testCanCreateTextLabel()
+	{
+		$static                          = $this->former->text('foo')->label('bar', $this->testAttributes)->__toString();
+		$label                           = $this->matchLabel('Bar', 'foo');
+		$label['attributes']['class']    = 'foo control-label';
+		$label['attributes']['data-foo'] = 'bar';
+		$this->assertHTML($label, $static);
+		$this->assertHTML($this->matchField(), $static);
+		$this->assertHTML($this->matchControlGroup(), $static);
+
+		$this->resetLabels();
+		$input = $this->former->text('foo', 'bar')->__toString();
+		$this->assertHTML($this->matchLabel('Bar', 'foo'), $input);
+		$this->assertHTML($this->matchField(), $input);
+		$this->assertHTML($this->matchControlGroup(), $input);
+	}
+
+	public function testCanCreateTextLabelWithoutBootstrap()
+	{
+		$this->former->framework('Nude');
+
+		$static                          = $this->former->text('foo')->label('bar', $this->testAttributes)->__toString();
+		$label                           = $this->matchLabel('Bar');
+		$label['attributes']['class']    = 'foo';
+		$label['attributes']['data-foo'] = 'bar';
+		$this->assertHTML($label, $static);
+		$this->assertHTML($this->matchField(), $static);
+
+		$input = $this->former->text('foo', 'bar')->__toString();
+		$label = $this->matchLabel('Bar');
+		unset($label['attributes']['class']);
+		$this->assertHTML($label, $static);
+		$this->assertHTML($this->matchField(), $static);
+	}
+
+	public function testCanCreateWithErrors()
+	{
+		$this->former->withErrors($this->validator);
+
+		$required = $this->former->text('required')->__toString();
+		$matcher  =
+			'<div class="control-group error">'.
+			'<label for="required" class="control-label">Required</label>'.
+			'<div class="controls">'.
+			'<input id="required" type="text" name="required">'.
+			'<span class="help-inline">The required field is required.</span>'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $required);
+	}
+
+	public function testAnonymousFieldHasNoErrors()
+	{
+		$this->former->withErrors($this->validator);
+
+		$required = $this->former->text()->__toString();
+		$matcher  =
+			'<div class="control-group">'.
+			'<div class="controls">'.
+			'<input type="text">'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $required);
+	}
+
+	public function testCanDisableErrors()
+	{
+		$this->mockConfig(array('error_messages' => false));
+		$this->former->withErrors($this->validator);
+
+		$required = $this->former->text('required')->__toString();
+		$matcher  =
+			'<div class="control-group error">'.
+			'<label for="required" class="control-label">Required</label>'.
+			'<div class="controls">'.
+			'<input id="required" type="text" name="required">'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $required);
+	}
+
+	public function testCanCreatePopulate()
+	{
+		$this->former->populate(array('foo' => 'bar'));
+
+		$populate = $this->former->text('foo')->__toString();
+		$matcher  = $this->controlGroup('<input id="foo" type="text" name="foo" value="bar">');
+
+		$this->assertEquals($matcher, $populate);
+	}
+
+	public function testCanCreatePopulateWithSpecificValue()
+	{
+		$this->former->populate(array('foo' => 'bar'));
+		$this->former->populateField('foo', 'foo');
+
+		$populate = $this->former->text('foo')->__toString();
+		$matcher  = $this->controlGroup('<input id="foo" type="text" name="foo" value="foo">');
+
+		$this->assertEquals($matcher, $populate);
+	}
+
+	public function testCanCreateNestedRelationships()
+	{
+		$foo = (object) array('bar' => (object) array('kal' => (object) array('ter' => 'men')));
+		$this->former->populate($foo);
+
+		$text    = $this->former->text('bar.kal.ter')->__toString();
+		$matcher = $this->controlGroup(
+			'<input id="bar.kal.ter" type="text" name="bar.kal.ter" value="men">',
+			'<label for="bar.kal.ter" class="control-label">Bar.kal.ter</label>');
+
+		$this->assertEquals($matcher, $text);
+	}
+
+	public function testCanCreateNestedRelationshipsRenamedField()
+	{
+		$foo = (object) array('bar' => (object) array('kal' => (object) array('ter' => 'men')));
+		$this->former->populate($foo);
+
+		$text    = $this->former->text('bar.kal.ter')->name('ter')->__toString();
+		$matcher = $this->controlGroup(
+			'<input id="ter" type="text" name="ter" value="men">',
+			'<label for="ter" class="control-label">Ter</label>');
+
+		$this->assertEquals($matcher, $text);
+	}
+
+	public function testCanCreateMultipleNestedRelationships()
+	{
+		for ($i = 0; $i < 2; $i++) {
+			$bar[] = (object) array('kal' => 'val'.$i);
+		}
+		$foo = (object) array('bar' => $bar);
+		$this->former->populate($foo);
+
+		$text    = $this->former->text('bar.kal')->__toString();
+		$matcher = $this->controlGroup(
+			'<input id="bar.kal" type="text" name="bar.kal" value="val0, val1">',
+			'<label for="bar.kal" class="control-label">Bar.kal</label>');
+
+		$this->assertEquals($matcher, $text);
+	}
+
+	public function testCanCreateNoPopulatingPasswords()
+	{
+		$this->former->populate(array('foo' => 'bar'));
+		$populate = $this->former->password('foo')->__toString();
+		$matcher  = $this->controlGroup('<input id="foo" type="password" name="foo">');
+
+		$this->assertEquals($matcher, $populate);
+	}
+
+	public function testCanCreateDatalist()
+	{
+		$datalist = $this->former->text('foo')->useDatalist(array('foo' => 'bar', 'kel' => 'tar'))->__toString();
+		$matcher  =
+			'<div class="control-group">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<div class="controls">'.
+			'<input list="datalist_foo" id="foo" type="text" name="foo">'.
+			'<datalist id="datalist_foo">'.
+			'<option value="bar">foo</option>'.
+			'<option value="tar">kel</option>'.
+			'</datalist>'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $datalist);
+	}
+
+	public function testCanCreateDatalistCustomList()
+	{
+		$datalist = $this->former->text('foo')->list('bar')->useDatalist(array(
+				'foo' => 'bar',
+				'kel' => 'tar'
+			))->__toString();
+		$matcher  =
+			'<div class="control-group">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<div class="controls">'.
+			'<input list="bar" id="foo" type="text" name="foo">'.
+			'<datalist id="bar">'.
+			'<option value="bar">foo</option>'.
+			'<option value="tar">kel</option>'.
+			'</datalist>'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $datalist);
+	}
+
+	public function testCanCreateNumberRange()
+	{
+		$range = $this->former->number('foo')->range(1, 5)->__toString();
+
+		$this->assertContains('min="1" max="5"', $range);
+	}
+
+	public function testLabelCastsToString()
+	{
+		$object = new DummyEloquent(array('name' => 'Bar'));
+
+		$static = $this->former->checkbox('foo')->label($object)->__toString();
+		$label  = $this->matchLabel('Bar', 'foo');
+		$this->assertHTML($label, $static);
+	}
+
+	public function testUnderscoresInLabelsAreConverted()
+	{
+		$static = $this->former->text('foo')->label('customer_name')->__toString();
+		$label  = $this->matchLabel('Customer name', 'foo');
+		$this->assertHTML($label, $static);
+	}
 }
diff --git a/tests/Fields/RadioTest.php b/tests/Fields/RadioTest.php
index 43e033b8..68051398 100644
--- a/tests/Fields/RadioTest.php
+++ b/tests/Fields/RadioTest.php
@@ -6,269 +6,273 @@
 class RadioTest extends FormerTests
 {
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  /**
-   * Matches a radio element
-   *
-   * @param  string  $name
-   * @param  string  $label
-   * @param  integer $value
-   * @param  boolean $inline
-   * @param  boolean $checked
-   *
-   * @return string
-   */
-  private function matchRadio($name = 'foo', $label = null, $value = 1, $inline = false, $checked = false)
-  {
-    $radioAttr = array(
-      'id'      => $name,
-      'type'    => 'radio',
-      'name'    => preg_replace('/[0-9]/', null, $name),
-      'checked' => 'checked',
-      'value'   => $value,
-    );
-    $labelAttr = array(
-      'for'   => $name,
-      'class' => 'radio',
-    );
-    if ($inline) {
-      $labelAttr['class'] .= $this->former->framework() === 'TwitterBootstrap3' ? ' radio-inline' : ' inline';
-    }
-    if (!$checked) unset($radioAttr['checked']);
-
-    $radio = '<input'.$this->attributes($radioAttr).'>';
-
-    return $label ? '<label'.$this->attributes($labelAttr). '>' .$radio.$label. '</label>' : $radio;
-  }
-
-  /**
-   * Matches a checked radio element
-   *
-   * @param  string  $name
-   * @param  string  $label
-   * @param  integer $value
-   * @param  boolean $inline
-   *
-   * @return string
-   */
-  private function matchCheckedRadio($name = 'foo', $label = null, $value = 1, $inline = false)
-  {
-    return $this->matchRadio($name, $label, $value, $inline, true);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testSingle()
-  {
-    $radio = $this->former->radio('foo')->__toString();
-    $matcher = $this->controlGroup($this->matchRadio());
-
-    $this->assertEquals($matcher, $radio);
-  }
-
-  public function testSingleWithLabel()
-  {
-    $radio = $this->former->radio('foo')->text('bar')->__toString();
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Bar'));
-
-    $this->assertEquals($matcher, $radio);
-  }
-
-  public function testSingleWithValue()
-  {
-    $radio = $this->former->radio('foo')->text('bar')->value('foo')->__toString();
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Bar', 'foo'));
-
-    $this->assertEquals($matcher, $radio);
-  }
-
-  public function testMultiple()
-  {
-    $radios = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar'));
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testInline()
-  {
-    $radios1 = $this->former->inline_radios('foo')->radios('foo', 'bar')->__toString();
-    $this->resetLabels();
-    $radios2 = $this->former->radios('foo')->inline()->radios('foo', 'bar')->__toString();
-
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0, true).$this->matchRadio('foo2', 'Bar', 1, true));
-
-    $this->assertEquals($matcher, $radios1);
-    $this->assertEquals($matcher, $radios2);
-  }
-
-  public function testInlineTwitterBootstrap3()
-  {
-    $this->former->framework('TwitterBootstrap3');
-
-    $radios1 = $this->former->inline_radios('foo')->radios('foo', 'bar')->__toString();
-    $this->resetLabels();
-    $radios2 = $this->former->radios('foo')->inline()->radios('foo', 'bar')->__toString();
-
-    $matcher = $this->formGroup($this->matchRadio('foo', 'Foo', 0, true).$this->matchRadio('foo2', 'Bar', 1, true));
-
-    $this->assertEquals($matcher, $radios1);
-    $this->assertEquals($matcher, $radios2);
-  }
-
-  public function testStacked()
-  {
-    $radios1 = $this->former->stacked_radios('foo')->radios('foo', 'bar')->__toString();
-    $this->resetLabels();
-    $radios2 = $this->former->radios('foo')->stacked()->radios('foo', 'bar')->__toString();
-
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
-
-    $this->assertEquals($matcher, $radios1);
-    $this->assertEquals($matcher, $radios2);
-  }
-
-  public function testMultipleArray()
-  {
-    $radios = $this->former->radios('foo')->radios(array('Foo' => 'foo', 'Bar' => 'bar'))->__toString();
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('bar', 'Bar'));
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testMultipleCustom()
-  {
-    $radios = $this->former->radios('foo')->radios($this->radioCheckables)->__toString();
-    $matcher = $this->controlGroup(
-    '<label for="foo" class="radio">'.
-      '<input data-foo="bar" value="foo" id="foo" type="radio" name="foo">'.
-      'Foo'.
-    '</label>'.
-    '<label for="bar" class="radio">'.
-      '<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
-      'Bar'.
-    '</label>');
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testMultipleCustomNoName()
-  {
-    $checkables = $this->radioCheckables;
-    unset($checkables['Foo']['name']);
-    unset($checkables['Bar']['name']);
-
-    $radios = $this->former->radios('foo')->radios($checkables)->__toString();
-    $matcher = $this->controlGroup(
-    '<label for="foo" class="radio">'.
-      '<input data-foo="bar" value="foo" id="foo" type="radio" name="foo">'.
-      'Foo'.
-    '</label>'.
-    '<label for="bar" class="radio">'.
-      '<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
-      'Bar'.
-    '</label>');
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testCheck()
-  {
-    $radio = $this->former->radio('foo')->check()->__toString();
-    $matcher = $this->controlGroup($this->matchCheckedRadio());
-
-    $this->assertEquals($matcher, $radio);
-  }
-
-  public function testCheckOneInSeveral()
-  {
-    $radios = $this->former->radios('foo')->radios('foo', 'bar')->check(0)->__toString();
-    $matcher = $this->controlGroup($this->matchCheckedRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testCheckOneInSeveralCustom()
-  {
-    $radios = $this->former->radios('foo')->radios($this->radioCheckables)->check('foo')->__toString();
-    $matcher = $this->controlGroup(
-      '<label for="foo" class="radio">'.
-      '<input data-foo="bar" value="foo" id="foo" type="radio" name="foo" checked="checked">'.
-      'Foo'.
-      '</label>'.
-      '<label for="bar" class="radio">'.
-      '<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
-      'Bar'.
-      '</label>');
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testCheckMultiple()
-  {
-    $radios = $this->former->radios('foo')->radios('foo', 'bar')->check(array(0 => false, 1 => true))->__toString();
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchCheckedRadio('foo2', 'Bar', 1));
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testCheckMultipleCustom()
-  {
-    $radios = $this->former->radios('foo')->radios($this->radioCheckables)->check(array('foo' => true, 'bar' => false))->__toString();
-    $matcher = $this->controlGroup(
-      '<label for="foo" class="radio">'.
-      '<input data-foo="bar" value="foo" id="foo" type="radio" name="foo" checked="checked">'.
-      'Foo'.
-      '</label>'.
-      '<label for="bar" class="radio">'.
-      '<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
-      'Bar'.
-      '</label>');
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testCanAttributeIndividualLabelsPerRadio()
-  {
-    $radios = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testRepopulateFromPost()
-  {
-    $this->request->shouldReceive('input')->andReturn(0);
-
-    $radios = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckedRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testRepopulateFromModel()
-  {
-    $this->former->populate((object) array('foo' => 0));
-
-    $radios = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
-    $matcher = $this->controlGroup($this->matchCheckedRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
-
-    $this->assertEquals($matcher, $radios);
-  }
-
-  public function testInlineRadiosAreRendered()
-  {
-    $this->former->form()->close();
-    $this->former->inline_open();
-
-    $radio = $this->former->radio('foo', 'bar')->__toString();
-
-    $this->assertInternalType('string', $radio);
-  }
-
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	/**
+	 * Matches a radio element
+	 *
+	 * @param  string  $name
+	 * @param  string  $label
+	 * @param  integer $value
+	 * @param  boolean $inline
+	 * @param  boolean $checked
+	 *
+	 * @return string
+	 */
+	private function matchRadio($name = 'foo', $label = null, $value = 1, $inline = false, $checked = false)
+	{
+		$radioAttr = array(
+			'id'      => $name,
+			'type'    => 'radio',
+			'name'    => preg_replace('/[0-9]/', null, $name),
+			'checked' => 'checked',
+			'value'   => $value,
+		);
+		$labelAttr = array(
+			'for'   => $name,
+			'class' => 'radio',
+		);
+		if ($inline) {
+			$labelAttr['class'] .= $this->former->framework() === 'TwitterBootstrap3' ? ' radio-inline' : ' inline';
+		}
+		if (!$checked) {
+			unset($radioAttr['checked']);
+		}
+
+		$radio = '<input'.$this->attributes($radioAttr).'>';
+
+		return $label ? '<label'.$this->attributes($labelAttr).'>'.$radio.$label.'</label>' : $radio;
+	}
+
+	/**
+	 * Matches a checked radio element
+	 *
+	 * @param  string  $name
+	 * @param  string  $label
+	 * @param  integer $value
+	 * @param  boolean $inline
+	 *
+	 * @return string
+	 */
+	private function matchCheckedRadio($name = 'foo', $label = null, $value = 1, $inline = false)
+	{
+		return $this->matchRadio($name, $label, $value, $inline, true);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testSingle()
+	{
+		$radio   = $this->former->radio('foo')->__toString();
+		$matcher = $this->controlGroup($this->matchRadio());
+
+		$this->assertEquals($matcher, $radio);
+	}
+
+	public function testSingleWithLabel()
+	{
+		$radio   = $this->former->radio('foo')->text('bar')->__toString();
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Bar'));
+
+		$this->assertEquals($matcher, $radio);
+	}
+
+	public function testSingleWithValue()
+	{
+		$radio   = $this->former->radio('foo')->text('bar')->value('foo')->__toString();
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Bar', 'foo'));
+
+		$this->assertEquals($matcher, $radio);
+	}
+
+	public function testMultiple()
+	{
+		$radios  = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar'));
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testInline()
+	{
+		$radios1 = $this->former->inline_radios('foo')->radios('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$radios2 = $this->former->radios('foo')->inline()->radios('foo', 'bar')->__toString();
+
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0, true).$this->matchRadio('foo2', 'Bar', 1, true));
+
+		$this->assertEquals($matcher, $radios1);
+		$this->assertEquals($matcher, $radios2);
+	}
+
+	public function testInlineTwitterBootstrap3()
+	{
+		$this->former->framework('TwitterBootstrap3');
+
+		$radios1 = $this->former->inline_radios('foo')->radios('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$radios2 = $this->former->radios('foo')->inline()->radios('foo', 'bar')->__toString();
+
+		$matcher = $this->formGroup($this->matchRadio('foo', 'Foo', 0, true).$this->matchRadio('foo2', 'Bar', 1, true));
+
+		$this->assertEquals($matcher, $radios1);
+		$this->assertEquals($matcher, $radios2);
+	}
+
+	public function testStacked()
+	{
+		$radios1 = $this->former->stacked_radios('foo')->radios('foo', 'bar')->__toString();
+		$this->resetLabels();
+		$radios2 = $this->former->radios('foo')->stacked()->radios('foo', 'bar')->__toString();
+
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
+
+		$this->assertEquals($matcher, $radios1);
+		$this->assertEquals($matcher, $radios2);
+	}
+
+	public function testMultipleArray()
+	{
+		$radios  = $this->former->radios('foo')->radios(array('Foo' => 'foo', 'Bar' => 'bar'))->__toString();
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('bar', 'Bar'));
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testMultipleCustom()
+	{
+		$radios  = $this->former->radios('foo')->radios($this->radioCheckables)->__toString();
+		$matcher = $this->controlGroup(
+			'<label for="foo" class="radio">'.
+			'<input data-foo="bar" value="foo" id="foo" type="radio" name="foo">'.
+			'Foo'.
+			'</label>'.
+			'<label for="bar" class="radio">'.
+			'<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
+			'Bar'.
+			'</label>');
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testMultipleCustomNoName()
+	{
+		$checkables = $this->radioCheckables;
+		unset($checkables['Foo']['name']);
+		unset($checkables['Bar']['name']);
+
+		$radios  = $this->former->radios('foo')->radios($checkables)->__toString();
+		$matcher = $this->controlGroup(
+			'<label for="foo" class="radio">'.
+			'<input data-foo="bar" value="foo" id="foo" type="radio" name="foo">'.
+			'Foo'.
+			'</label>'.
+			'<label for="bar" class="radio">'.
+			'<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
+			'Bar'.
+			'</label>');
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testCheck()
+	{
+		$radio   = $this->former->radio('foo')->check()->__toString();
+		$matcher = $this->controlGroup($this->matchCheckedRadio());
+
+		$this->assertEquals($matcher, $radio);
+	}
+
+	public function testCheckOneInSeveral()
+	{
+		$radios  = $this->former->radios('foo')->radios('foo', 'bar')->check(0)->__toString();
+		$matcher = $this->controlGroup($this->matchCheckedRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testCheckOneInSeveralCustom()
+	{
+		$radios  = $this->former->radios('foo')->radios($this->radioCheckables)->check('foo')->__toString();
+		$matcher = $this->controlGroup(
+			'<label for="foo" class="radio">'.
+			'<input data-foo="bar" value="foo" id="foo" type="radio" name="foo" checked="checked">'.
+			'Foo'.
+			'</label>'.
+			'<label for="bar" class="radio">'.
+			'<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
+			'Bar'.
+			'</label>');
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testCheckMultiple()
+	{
+		$radios  = $this->former->radios('foo')->radios('foo', 'bar')->check(array(0 => false, 1 => true))->__toString();
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchCheckedRadio('foo2', 'Bar', 1));
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testCheckMultipleCustom()
+	{
+		$radios  = $this->former->radios('foo')->radios($this->radioCheckables)->check(array(
+				'foo' => true,
+				'bar' => false
+			))->__toString();
+		$matcher = $this->controlGroup(
+			'<label for="foo" class="radio">'.
+			'<input data-foo="bar" value="foo" id="foo" type="radio" name="foo" checked="checked">'.
+			'Foo'.
+			'</label>'.
+			'<label for="bar" class="radio">'.
+			'<input data-foo="bar" value="bar" id="bar" type="radio" name="foo">'.
+			'Bar'.
+			'</label>');
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testCanAttributeIndividualLabelsPerRadio()
+	{
+		$radios  = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
+		$matcher = $this->controlGroup($this->matchRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testRepopulateFromPost()
+	{
+		$this->request->shouldReceive('input')->andReturn(0);
+
+		$radios  = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
+		$matcher = $this->controlGroup($this->matchCheckedRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testRepopulateFromModel()
+	{
+		$this->former->populate((object) array('foo' => 0));
+
+		$radios  = $this->former->radios('foo')->radios('foo', 'bar')->__toString();
+		$matcher = $this->controlGroup($this->matchCheckedRadio('foo', 'Foo', 0).$this->matchRadio('foo2', 'Bar', 1));
+
+		$this->assertEquals($matcher, $radios);
+	}
+
+	public function testInlineRadiosAreRendered()
+	{
+		$this->former->form()->close();
+		$this->former->inline_open();
+
+		$radio = $this->former->radio('foo', 'bar')->__toString();
+
+		$this->assertInternalType('string', $radio);
+	}
 }
diff --git a/tests/Fields/SelectTest.php b/tests/Fields/SelectTest.php
index 95f69fd7..466fae57 100644
--- a/tests/Fields/SelectTest.php
+++ b/tests/Fields/SelectTest.php
@@ -1,434 +1,444 @@
 <?php
 namespace Former\Fields;
 
+use Former\Dummy\DummyEloquent;
 use Former\TestCases\FormerTests;
 use HtmlObject\Element;
 use Illuminate\Support\Collection;
-use Former\Dummy\DummyEloquent;
 
 class SelectTest extends FormerTests
 {
-  /**
-   * An array of dummy options
-   *
-   * @var array
-   */
-  private $options = array('foo' => 'bar', 'kal' => 'ter');
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testSelect()
-  {
-    $select = $this->former->select('foo')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testMultiselect()
-  {
-    $select = $this->former->multiselect('foo')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" multiple="true" name="foo[]"></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testMultiselectOptions()
-  {
-    $select = $this->former->multiselect('foo')->options($this->options)->value(array('foo', 'kal'))->__toString();
-    $matcher = $this->controlGroup('<select id="foo" multiple="true" name="foo[]"><option value="foo" selected="selected">bar</option><option value="kal" selected="selected">ter</option></select>');
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectOptions()
-  {
-    $select = $this->former->select('foo')->options($this->options)->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="foo">bar</option><option value="kal">ter</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testGetSelectOptions()
-  {
-    $select = $this->former->select('foo')->options($this->options);
-
-    foreach ($this->options as $key => $option) {
-      $options[$key] = Element::create('option', $option, array('value' => $key));
-    }
-
-    $this->assertEquals($select->getOptions(), $options);
-  }
-
-  public function testSelectPlaceholder()
-  {
-    $select = $this->former->select('foo')->options($this->options)->placeholder('Pick something')->__toString();
-    $matcher = $this->controlGroup(
-      '<select id="foo" name="foo">'.
-        '<option value="" disabled="disabled" selected="selected">Pick something</option>'.
-        '<option value="foo">bar</option>'.
-        '<option value="kal">ter</option>'.
-      '</select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testPlaceholderUnselected()
-  {
-    $select = $this->former->select('foo')->value('foo')->options($this->options)->placeholder('Pick something')->__toString();
-    $matcher = $this->controlGroup(
-      '<select id="foo" name="foo">'.
-        '<option value="" disabled="disabled">Pick something</option>'.
-        '<option value="foo" selected="selected">bar</option>'.
-        '<option value="kal">ter</option>'.
-      '</select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectLang()
-  {
-    $select = $this->former->select('foo')->options($this->translator->get('pagination'), 'previous')->__toString();
-    $matcher = $this->controlGroup(
-    '<select id="foo" name="foo">'.
-      '<option value="previous" selected="selected">Previous</option>'.
-      '<option value="next">Next</option>'.
-    '</select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectEloquent()
-  {
-    for($i = 0; $i < 2; $i++) $eloquent[] = (object) array('id' => $i, 'foo' => 'bar');
-    $select = $this->former->select('foo')->fromQuery($eloquent, 'foo')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectEloquentKey()
-  {
-    for($i = 0; $i < 2; $i++) $eloquent[] = (object) array('age' => $i, 'foo' => 'bar');
-    $select = $this->former->select('foo')->fromQuery($eloquent, 'foo', 'age')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectEloquentWrongKey()
-  {
-    for($i = 0; $i < 2; $i++) $eloquent[] = (object) array('age' => $i, 'foo' => 'bar');
-    $select = $this->former->select('foo')->fromQuery($eloquent, 'foo', 'id')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="bar">bar</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectWithAString()
-  {
-    $select = $this->former->select('foo')->fromQuery('This is not an array', 'foo', 'id')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">This is not an array</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectWithAnInteger()
-  {
-    $select = $this->former->select('foo')->fromQuery(456, 'foo', 'id')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">456</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectEloquentArray()
-  {
-    for($i = 0; $i < 2; $i++) $eloquent[] = (object) array('age' => $i, 'foo' => 'bar');
-    $select = $this->former->select('foo')->fromQuery($eloquent, 'foo', 'age')->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testNestedRelationships()
-  {
-    for($i = 0; $i < 2; $i++) $bar[] = (object) array('id' => $i, 'kal' => 'val'.$i);
-    $foo = (object) array('bar' => $bar);
-    $this->former->populate($foo);
-
-    $select = $this->former->select('bar.kal')->__toString();
-    $matcher = $this->controlGroup(
-      '<select id="bar.kal" name="bar.kal">'.
-        '<option value="0">val0</option>'.
-        '<option value="1">val1</option>'.
-      '</select>',
-      '<label for="bar.kal" class="control-label">Bar.kal</label>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectEloquentMagicMethods()
-  {
-    for ($i = 0; $i < 2; $i++) {
-      $eloquentObject = new DummyEloquent(array('id' => $i, 'name' => 'bar'));
-      $eloquent[] = $eloquentObject;
-    }
-
-    $select = $this->former->select('foo')->fromQuery($eloquent)->__toString();
-    $matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectOptionsValue()
-  {
-    $select = $this->former->select('foo')->data_foo('bar')->options($this->options, 'kal')->__toString();
-    $matcher = $this->controlGroup(
-    '<select data-foo="bar" id="foo" name="foo">'.
-      '<option value="foo">bar</option>'.
-      '<option value="kal" selected="selected">ter</option>'.
-    '</select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testSelectOptionsValueMethod()
-  {
-    $select = $this->former->select('foo')->data_foo('bar')->options($this->options)->select('kal')->__toString();
-    $matcher = $this->controlGroup(
-    '<select data-foo="bar" id="foo" name="foo">'.
-      '<option value="foo">bar</option>'.
-      '<option value="kal" selected="selected">ter</option>'.
-    '</select>');
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testCanAddAdditionalOptionsToCreatedSelect()
-  {
-    $select = $this->former->select('foo')->addOption(null)->options($this->options);
-    $select->addOption('bis', 'ter');
-    $matcher = $this->controlGroup(
-    '<select id="foo" name="foo">'.
-      '<option value=""></option>'.
-      '<option value="foo">bar</option>'.
-      '<option value="kal">ter</option>'.
-      '<option value="ter">bis</option>'.
-    '</select>');
-
-    $this->assertEquals($matcher, $select->__toString());
-  }
-
-  public function testPopulateUnexistingOptionsDoesntThrowError()
-  {
-    $this->former->populate(array('foo' => 'foo'));
-    $select = $this->former->select('foo')->options(array('bar' => 'Bar'));
-    $matcher = $this->controlGroup(
-    '<select id="foo" name="foo">'.
-      '<option value="bar">Bar</option>'.
-    '</select>');
-
-    $this->assertEquals($matcher, $select->__toString());
-  }
-
-  public function testCanPopulateWithCollections()
-  {
-    $collection = new Collection(array(
-      new DummyEloquent(array('id' => 1, 'name' => 'foo')),
-      new DummyEloquent(array('id' => 2, 'name' => 'bar'))
-    ));
-
-    $select = $this->former->select('foo')->fromQuery($collection);
-    $matcher = $this->controlGroup(
-    '<select id="foo" name="foo">'.
-      '<option value="1">foo</option>'.
-      '<option value="2">bar</option>'.
-    '</select>');
-
-    $this->assertEquals($matcher, $select->__toString());
-  }
-
-  public function testCanRenderSelectsDynamically()
-  {
-    $html[] = $this->former->select('frmVehicleYears')->label('Vehicle Year')->options($this->options)->wrapAndRender();
-    $html[] = $this->former->select('frmVehicleMake')->label('Make')->options($this->options)->wrapAndRender();
-
-    $results = implode(' ', $html);
-    $this->assertContains('control-group', $results);
-  }
-
-  public function testCanPopulateMultipleSelects()
-  {
-    $collection = new Collection(array(
-      new DummyEloquent(array('id' => 1, 'name' => 'foo')),
-      new DummyEloquent(array('id' => 2, 'name' => 'bar')),
-      new DummyEloquent(array('id' => 3, 'name' => 'bar'))
-    ));
-
-    $select = $this->former->select('foo')->fromQuery($collection)->select(array(1, 2))->render();
-    $matcher = '<select id="foo" name="foo"><option value="1" selected="selected">foo</option><option value="2" selected="selected">bar</option><option value="3">bar</option></select>';
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testCanRepopulateMultipleSelectsFromPost()
-  {
-    $options = array(
-      'foo' => 'foo_name',
-      'bar' => 'bar_name',
-      'baz' => 'baz_name',
-    );
-
-    $this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
-    $this->request->shouldReceive('input')->with('test', '', true)->andReturn(array('foo', 'bar'));
-
-    $select = $this->former->multiselect('test')->options($options)->render();
-    $matcher =
-      '<select id="test" multiple="true" name="test[]">'.
-        '<option value="foo" selected="selected">foo_name</option>'.
-        '<option value="bar" selected="selected">bar_name</option>'.
-        '<option value="baz">baz_name</option>'.
-      '</select>';
-
-    $this->assertEquals($matcher, $select);
-  }
-
-  public function testCanCreateRangeSelects()
-  {
-    $select = $this->former->select('foo')->range(1, 10);
-
-    $this->assertEquals(range(1, 10), array_keys($select->getOptions()));
-    $this->assertContains('<option value="1">1</option>', $select->render());
-    $this->assertContains('<option value="10">10</option>', $select->render());
-  }
-
-  public function testCanCreateSelectGroups()
-  {
-    $values = array('foo' => array(1 => 'foo', 2 => 'bar'), 'bar' => array(3 => 'foo', 4 => 'bar'));
-    $select = $this->former->select('foo')->options($values);
-
-    $matcher =
-    '<select id="foo" name="foo">'.
-      '<optgroup label="foo">'.
-        '<option value="1">foo</option><option value="2">bar</option>'.
-      '</optgroup>'.
-      '<optgroup label="bar">'.
-        '<option value="3">foo</option><option value="4">bar</option>'.
-      '</optgroup>'.
-    '</select>';
-    $this->assertEquals($matcher, $select->render());
-  }
-
-  public function testCanPopulateSelectGroups()
-  {
-    $values = array('foo' => array(1 => 'foo', 2 => 'bar'), 'bar' => array(3 => 'foo', 4 => 'bar'));
-    $select = $this->former->select('foo')->options($values)->select(4);
-
-    $matcher =
-    '<select id="foo" name="foo">'.
-      '<optgroup label="foo">'.
-        '<option value="1">foo</option><option value="2">bar</option>'.
-      '</optgroup>'.
-      '<optgroup label="bar">'.
-        '<option value="3">foo</option><option value="4" selected="selected">bar</option>'.
-      '</optgroup>'.
-    '</select>';
-    $this->assertEquals($matcher, $select->render());
-  }
-
-  public function testCanUseEmptyPlaceholders()
-  {
-    $select = $this->former->select('foo')->options(array(
-      '' => '',
-      0 => 'foo',
-      1 => 'bar',
-    ));
-
-    $matcher = '<select id="foo" name="foo"><option value=""></option><option value="0">foo</option><option value="1">bar</option></select>';
-
-    $this->assertEquals($matcher, $select->render());
-  }
-
-  public function testCanPassAttributesToOptions()
-  {
-    $select = $this->former->select('foo')->options(array(
-      'foo' => array('value' => 'bar', 'class' => 'myclass'),
-      'baz' => array('value' => 'qux', 'class' => 'myclass'),
-    ))->select('bar');
-
-    $matcher = '<select id="foo" name="foo"><option value="bar" class="myclass" selected="selected">foo</option><option value="qux" class="myclass">baz</option></select>';
-
-    $this->assertEquals($matcher, $select->render());
-  }
-
-  public function testOptionsSelectActsTheSameAsSelect()
-  {
-    $options = array('foo', 'bar');
-    $select = $this->former->select('foo')->options($options, 0)->render();
-    $select2 = $this->former->select('bar')->options($options)->select(0)->render();
-
-    $matcher = '<option value="0" selected="selected">foo</option><option value="1">bar</option>';
-
-    $this->assertContains($matcher, $select2);
-    $this->assertContains($matcher, $select);
-  }
-
-  public function testCanRepopulateFromPostArrayNotation()
-  {
-    $options = array('foo', 'bar');
-    $this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
-    $this->request->shouldReceive('input')->with('foo', '', true)->andReturn(array(0, 1));
-
-    $select  = $this->former->select('foo[]')->options($options);
-    $matcher = '<select id="foo[]" name="foo[]"><option value="0" selected="selected">foo</option><option value="1" selected="selected">bar</option></select>';
-
-    $this->assertEquals($matcher, $select->render());
-  }
-
-  public function testCanRepopulateFromPostStringIndexedArrayNotation()
-  {
-    $options = array('foo' => 'foo_name', 'bar' => 'bar_name');
-    $this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
-    $this->request->shouldReceive('input')->with('foo', '', true)->andReturn(array('foo', 'bar'));
-
-    $select  = $this->former->select('foo[]')->options($options);
-    $matcher =
-      '<select id="foo[]" name="foo[]">'.
-        '<option value="foo" selected="selected">foo_name</option>'.
-        '<option value="bar" selected="selected">bar_name</option>'.
-      '</select>';
-
-    $this->assertEquals($matcher, $select->render());
-  }
-
-  public function testMultiselectRepopulationDoesntCreateOptions()
-  {
-    $options = array(1 => 'foo', 2 => 'bar');
-    $this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
-    $this->request->shouldReceive('input')->with('foo', '', true)->andReturn(array(1));
-
-    $select  = $this->former->multiselect('foo')->options($options);
-    $matcher = '<select id="foo" multiple="true" name="foo[]"><option value="1" selected="selected">foo</option><option value="2">bar</option></select>';
-
-    $this->assertEquals($matcher, $select->render());
-  }
-
-  public function testSelectCanPickRightOptionWithOptgroups()
-  {
-    $items = array(
-      'foo' => array(
-        1 => 'foo',
-      ),
-      'bar' => array(
-        3 => 'bar',
-        4 => 'baz',
-      ),
-    );
-
-    $select = $this->former->select('category_id')->options($items, 1);
-    $matcher = '<optgroup label="foo"><option value="1" selected="selected">foo</option></optgroup><optgroup label="bar"><option value="3">bar</option><option value="4">baz</option></optgroup>';
-
-    $this->assertContains($matcher, $select->render());
-  }
+	/**
+	 * An array of dummy options
+	 *
+	 * @var array
+	 */
+	private $options = array('foo' => 'bar', 'kal' => 'ter');
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testSelect()
+	{
+		$select  = $this->former->select('foo')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testMultiselect()
+	{
+		$select  = $this->former->multiselect('foo')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" multiple="true" name="foo[]"></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testMultiselectOptions()
+	{
+		$select  = $this->former->multiselect('foo')->options($this->options)->value(array('foo', 'kal'))->__toString();
+		$matcher = $this->controlGroup('<select id="foo" multiple="true" name="foo[]"><option value="foo" selected="selected">bar</option><option value="kal" selected="selected">ter</option></select>');
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectOptions()
+	{
+		$select  = $this->former->select('foo')->options($this->options)->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="foo">bar</option><option value="kal">ter</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testGetSelectOptions()
+	{
+		$select = $this->former->select('foo')->options($this->options);
+
+		foreach ($this->options as $key => $option) {
+			$options[$key] = Element::create('option', $option, array('value' => $key));
+		}
+
+		$this->assertEquals($select->getOptions(), $options);
+	}
+
+	public function testSelectPlaceholder()
+	{
+		$select  = $this->former->select('foo')->options($this->options)->placeholder('Pick something')->__toString();
+		$matcher = $this->controlGroup(
+			'<select id="foo" name="foo">'.
+			'<option value="" disabled="disabled" selected="selected">Pick something</option>'.
+			'<option value="foo">bar</option>'.
+			'<option value="kal">ter</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testPlaceholderUnselected()
+	{
+		$select  = $this->former->select('foo')->value('foo')->options($this->options)->placeholder('Pick something')->__toString();
+		$matcher = $this->controlGroup(
+			'<select id="foo" name="foo">'.
+			'<option value="" disabled="disabled">Pick something</option>'.
+			'<option value="foo" selected="selected">bar</option>'.
+			'<option value="kal">ter</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectLang()
+	{
+		$select  = $this->former->select('foo')->options($this->translator->get('pagination'), 'previous')->__toString();
+		$matcher = $this->controlGroup(
+			'<select id="foo" name="foo">'.
+			'<option value="previous" selected="selected">Previous</option>'.
+			'<option value="next">Next</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectEloquent()
+	{
+		for ($i = 0; $i < 2; $i++) {
+			$eloquent[] = (object) array('id' => $i, 'foo' => 'bar');
+		}
+		$select  = $this->former->select('foo')->fromQuery($eloquent, 'foo')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectEloquentKey()
+	{
+		for ($i = 0; $i < 2; $i++) {
+			$eloquent[] = (object) array('age' => $i, 'foo' => 'bar');
+		}
+		$select  = $this->former->select('foo')->fromQuery($eloquent, 'foo', 'age')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectEloquentWrongKey()
+	{
+		for ($i = 0; $i < 2; $i++) {
+			$eloquent[] = (object) array('age' => $i, 'foo' => 'bar');
+		}
+		$select  = $this->former->select('foo')->fromQuery($eloquent, 'foo', 'id')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="bar">bar</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectWithAString()
+	{
+		$select  = $this->former->select('foo')->fromQuery('This is not an array', 'foo', 'id')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">This is not an array</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectWithAnInteger()
+	{
+		$select  = $this->former->select('foo')->fromQuery(456, 'foo', 'id')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">456</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectEloquentArray()
+	{
+		for ($i = 0; $i < 2; $i++) {
+			$eloquent[] = (object) array('age' => $i, 'foo' => 'bar');
+		}
+		$select  = $this->former->select('foo')->fromQuery($eloquent, 'foo', 'age')->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testNestedRelationships()
+	{
+		for ($i = 0; $i < 2; $i++) {
+			$bar[] = (object) array('id' => $i, 'kal' => 'val'.$i);
+		}
+		$foo = (object) array('bar' => $bar);
+		$this->former->populate($foo);
+
+		$select  = $this->former->select('bar.kal')->__toString();
+		$matcher = $this->controlGroup(
+			'<select id="bar.kal" name="bar.kal">'.
+			'<option value="0">val0</option>'.
+			'<option value="1">val1</option>'.
+			'</select>',
+			'<label for="bar.kal" class="control-label">Bar.kal</label>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectEloquentMagicMethods()
+	{
+		for ($i = 0; $i < 2; $i++) {
+			$eloquentObject = new DummyEloquent(array('id' => $i, 'name' => 'bar'));
+			$eloquent[]     = $eloquentObject;
+		}
+
+		$select  = $this->former->select('foo')->fromQuery($eloquent)->__toString();
+		$matcher = $this->controlGroup('<select id="foo" name="foo"><option value="0">bar</option><option value="1">bar</option></select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectOptionsValue()
+	{
+		$select  = $this->former->select('foo')->data_foo('bar')->options($this->options, 'kal')->__toString();
+		$matcher = $this->controlGroup(
+			'<select data-foo="bar" id="foo" name="foo">'.
+			'<option value="foo">bar</option>'.
+			'<option value="kal" selected="selected">ter</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testSelectOptionsValueMethod()
+	{
+		$select  = $this->former->select('foo')->data_foo('bar')->options($this->options)->select('kal')->__toString();
+		$matcher = $this->controlGroup(
+			'<select data-foo="bar" id="foo" name="foo">'.
+			'<option value="foo">bar</option>'.
+			'<option value="kal" selected="selected">ter</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testCanAddAdditionalOptionsToCreatedSelect()
+	{
+		$select = $this->former->select('foo')->addOption(null)->options($this->options);
+		$select->addOption('bis', 'ter');
+		$matcher = $this->controlGroup(
+			'<select id="foo" name="foo">'.
+			'<option value=""></option>'.
+			'<option value="foo">bar</option>'.
+			'<option value="kal">ter</option>'.
+			'<option value="ter">bis</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select->__toString());
+	}
+
+	public function testPopulateUnexistingOptionsDoesntThrowError()
+	{
+		$this->former->populate(array('foo' => 'foo'));
+		$select  = $this->former->select('foo')->options(array('bar' => 'Bar'));
+		$matcher = $this->controlGroup(
+			'<select id="foo" name="foo">'.
+			'<option value="bar">Bar</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select->__toString());
+	}
+
+	public function testCanPopulateWithCollections()
+	{
+		$collection = new Collection(array(
+			new DummyEloquent(array('id' => 1, 'name' => 'foo')),
+			new DummyEloquent(array('id' => 2, 'name' => 'bar'))
+		));
+
+		$select  = $this->former->select('foo')->fromQuery($collection);
+		$matcher = $this->controlGroup(
+			'<select id="foo" name="foo">'.
+			'<option value="1">foo</option>'.
+			'<option value="2">bar</option>'.
+			'</select>');
+
+		$this->assertEquals($matcher, $select->__toString());
+	}
+
+	public function testCanRenderSelectsDynamically()
+	{
+		$html[] = $this->former->select('frmVehicleYears')->label('Vehicle Year')->options($this->options)->wrapAndRender();
+		$html[] = $this->former->select('frmVehicleMake')->label('Make')->options($this->options)->wrapAndRender();
+
+		$results = implode(' ', $html);
+		$this->assertContains('control-group', $results);
+	}
+
+	public function testCanPopulateMultipleSelects()
+	{
+		$collection = new Collection(array(
+			new DummyEloquent(array('id' => 1, 'name' => 'foo')),
+			new DummyEloquent(array('id' => 2, 'name' => 'bar')),
+			new DummyEloquent(array('id' => 3, 'name' => 'bar'))
+		));
+
+		$select  = $this->former->select('foo')->fromQuery($collection)->select(array(1, 2))->render();
+		$matcher = '<select id="foo" name="foo"><option value="1" selected="selected">foo</option><option value="2" selected="selected">bar</option><option value="3">bar</option></select>';
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testCanRepopulateMultipleSelectsFromPost()
+	{
+		$options = array(
+			'foo' => 'foo_name',
+			'bar' => 'bar_name',
+			'baz' => 'baz_name',
+		);
+
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
+		$this->request->shouldReceive('input')->with('test', '', true)->andReturn(array('foo', 'bar'));
+
+		$select  = $this->former->multiselect('test')->options($options)->render();
+		$matcher =
+			'<select id="test" multiple="true" name="test[]">'.
+			'<option value="foo" selected="selected">foo_name</option>'.
+			'<option value="bar" selected="selected">bar_name</option>'.
+			'<option value="baz">baz_name</option>'.
+			'</select>';
+
+		$this->assertEquals($matcher, $select);
+	}
+
+	public function testCanCreateRangeSelects()
+	{
+		$select = $this->former->select('foo')->range(1, 10);
+
+		$this->assertEquals(range(1, 10), array_keys($select->getOptions()));
+		$this->assertContains('<option value="1">1</option>', $select->render());
+		$this->assertContains('<option value="10">10</option>', $select->render());
+	}
+
+	public function testCanCreateSelectGroups()
+	{
+		$values = array('foo' => array(1 => 'foo', 2 => 'bar'), 'bar' => array(3 => 'foo', 4 => 'bar'));
+		$select = $this->former->select('foo')->options($values);
+
+		$matcher =
+			'<select id="foo" name="foo">'.
+			'<optgroup label="foo">'.
+			'<option value="1">foo</option><option value="2">bar</option>'.
+			'</optgroup>'.
+			'<optgroup label="bar">'.
+			'<option value="3">foo</option><option value="4">bar</option>'.
+			'</optgroup>'.
+			'</select>';
+		$this->assertEquals($matcher, $select->render());
+	}
+
+	public function testCanPopulateSelectGroups()
+	{
+		$values = array('foo' => array(1 => 'foo', 2 => 'bar'), 'bar' => array(3 => 'foo', 4 => 'bar'));
+		$select = $this->former->select('foo')->options($values)->select(4);
+
+		$matcher =
+			'<select id="foo" name="foo">'.
+			'<optgroup label="foo">'.
+			'<option value="1">foo</option><option value="2">bar</option>'.
+			'</optgroup>'.
+			'<optgroup label="bar">'.
+			'<option value="3">foo</option><option value="4" selected="selected">bar</option>'.
+			'</optgroup>'.
+			'</select>';
+		$this->assertEquals($matcher, $select->render());
+	}
+
+	public function testCanUseEmptyPlaceholders()
+	{
+		$select = $this->former->select('foo')->options(array(
+			'' => '',
+			0  => 'foo',
+			1  => 'bar',
+		));
+
+		$matcher = '<select id="foo" name="foo"><option value=""></option><option value="0">foo</option><option value="1">bar</option></select>';
+
+		$this->assertEquals($matcher, $select->render());
+	}
+
+	public function testCanPassAttributesToOptions()
+	{
+		$select = $this->former->select('foo')->options(array(
+			'foo' => array('value' => 'bar', 'class' => 'myclass'),
+			'baz' => array('value' => 'qux', 'class' => 'myclass'),
+		))->select('bar');
+
+		$matcher = '<select id="foo" name="foo"><option value="bar" class="myclass" selected="selected">foo</option><option value="qux" class="myclass">baz</option></select>';
+
+		$this->assertEquals($matcher, $select->render());
+	}
+
+	public function testOptionsSelectActsTheSameAsSelect()
+	{
+		$options = array('foo', 'bar');
+		$select  = $this->former->select('foo')->options($options, 0)->render();
+		$select2 = $this->former->select('bar')->options($options)->select(0)->render();
+
+		$matcher = '<option value="0" selected="selected">foo</option><option value="1">bar</option>';
+
+		$this->assertContains($matcher, $select2);
+		$this->assertContains($matcher, $select);
+	}
+
+	public function testCanRepopulateFromPostArrayNotation()
+	{
+		$options = array('foo', 'bar');
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
+		$this->request->shouldReceive('input')->with('foo', '', true)->andReturn(array(0, 1));
+
+		$select  = $this->former->select('foo[]')->options($options);
+		$matcher = '<select id="foo[]" name="foo[]"><option value="0" selected="selected">foo</option><option value="1" selected="selected">bar</option></select>';
+
+		$this->assertEquals($matcher, $select->render());
+	}
+
+	public function testCanRepopulateFromPostStringIndexedArrayNotation()
+	{
+		$options = array('foo' => 'foo_name', 'bar' => 'bar_name');
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
+		$this->request->shouldReceive('input')->with('foo', '', true)->andReturn(array('foo', 'bar'));
+
+		$select  = $this->former->select('foo[]')->options($options);
+		$matcher =
+			'<select id="foo[]" name="foo[]">'.
+			'<option value="foo" selected="selected">foo_name</option>'.
+			'<option value="bar" selected="selected">bar_name</option>'.
+			'</select>';
+
+		$this->assertEquals($matcher, $select->render());
+	}
+
+	public function testMultiselectRepopulationDoesntCreateOptions()
+	{
+		$options = array(1 => 'foo', 2 => 'bar');
+		$this->request->shouldReceive('input')->with('_token', '', true)->andReturn('foobar');
+		$this->request->shouldReceive('input')->with('foo', '', true)->andReturn(array(1));
+
+		$select  = $this->former->multiselect('foo')->options($options);
+		$matcher = '<select id="foo" multiple="true" name="foo[]"><option value="1" selected="selected">foo</option><option value="2">bar</option></select>';
+
+		$this->assertEquals($matcher, $select->render());
+	}
+
+	public function testSelectCanPickRightOptionWithOptgroups()
+	{
+		$items = array(
+			'foo' => array(
+				1 => 'foo',
+			),
+			'bar' => array(
+				3 => 'bar',
+				4 => 'baz',
+			),
+		);
+
+		$select  = $this->former->select('category_id')->options($items, 1);
+		$matcher = '<optgroup label="foo"><option value="1" selected="selected">foo</option></optgroup><optgroup label="bar"><option value="3">bar</option><option value="4">baz</option></optgroup>';
+
+		$this->assertContains($matcher, $select->render());
+	}
 }
diff --git a/tests/Fields/TextareaTest.php b/tests/Fields/TextareaTest.php
index b28c78d6..dfc1c52c 100644
--- a/tests/Fields/TextareaTest.php
+++ b/tests/Fields/TextareaTest.php
@@ -6,67 +6,67 @@
 class TextareaTest extends FormerTests
 {
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Matches a textarea
-   *
-   * @return array
-   */
-  public function matchTextarea()
-  {
-    return array(
-      'tag' => 'textarea',
-      'content' => 'bar',
-      'attributes' => array(
-        'class'    => 'foo',
-        'cols'     => '50',
-        'data-foo' => 'bar',
-        'id'       => 'foo',
-        'name'     => 'foo',
-        'rows'     => '10',
-      ),
-    );
-  }
+	/**
+	 * Matches a textarea
+	 *
+	 * @return array
+	 */
+	public function matchTextarea()
+	{
+		return array(
+			'tag'        => 'textarea',
+			'content'    => 'bar',
+			'attributes' => array(
+				'class'    => 'foo',
+				'cols'     => '50',
+				'data-foo' => 'bar',
+				'id'       => 'foo',
+				'name'     => 'foo',
+				'rows'     => '10',
+			),
+		);
+	}
 
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  public function testCanCreateArrayFields()
-  {
-    $this->former->populate(array('foo' => array('fr' => 'bar')));
-    $textarea = $this->former->textarea('foo[fr]')->__toString();
-    $matcher = '<div class="control-group"><label for="foo[fr]" class="control-label">Foo[fr]</label><div class="controls"><textarea id="foo[fr]" name="foo[fr]">bar</textarea></div></div>';
+	public function testCanCreateArrayFields()
+	{
+		$this->former->populate(array('foo' => array('fr' => 'bar')));
+		$textarea = $this->former->textarea('foo[fr]')->__toString();
+		$matcher  = '<div class="control-group"><label for="foo[fr]" class="control-label">Foo[fr]</label><div class="controls"><textarea id="foo[fr]" name="foo[fr]">bar</textarea></div></div>';
 
-    $this->assertEquals($matcher, $textarea);
-  }
+		$this->assertEquals($matcher, $textarea);
+	}
 
-  public function testCanCreateTextareas()
-  {
-    $attributes = $this->matchTextarea();
-    $textarea   = $this->former->textarea('foo')->setAttributes($attributes['attributes'])->value('bar')->__toString();
-    $matcher    = $this->matchTextarea();
+	public function testCanCreateTextareas()
+	{
+		$attributes = $this->matchTextarea();
+		$textarea   = $this->former->textarea('foo')->setAttributes($attributes['attributes'])->value('bar')->__toString();
+		$matcher    = $this->matchTextarea();
 
-    $this->assertControlGroup($textarea);
-    $this->assertHTML($matcher, $textarea);
-  }
+		$this->assertControlGroup($textarea);
+		$this->assertHTML($matcher, $textarea);
+	}
 
-  public function testTextareaContentIsProperlyEncoded()
-  {
-    $value = '</textarea><strong>foo</strong>';
-    $attributes = $this->matchTextarea();
-    $textarea   = $this->former
-      ->textarea('foo')
-      ->setAttributes($attributes['attributes'])
-      ->value($value)
-      ->__toString();
-    $matcher    = $this->matchTextarea();
-    $matcher['content'] = $value;
+	public function testTextareaContentIsProperlyEncoded()
+	{
+		$value              = '</textarea><strong>foo</strong>';
+		$attributes         = $this->matchTextarea();
+		$textarea           = $this->former
+			->textarea('foo')
+			->setAttributes($attributes['attributes'])
+			->value($value)
+			->__toString();
+		$matcher            = $this->matchTextarea();
+		$matcher['content'] = $value;
 
-    $this->assertControlGroup($textarea);
-    $this->assertHTML($matcher, $textarea);
-  }
+		$this->assertControlGroup($textarea);
+		$this->assertHTML($matcher, $textarea);
+	}
 }
diff --git a/tests/Fields/UneditableTest.php b/tests/Fields/UneditableTest.php
index 48748273..783192fd 100644
--- a/tests/Fields/UneditableTest.php
+++ b/tests/Fields/UneditableTest.php
@@ -6,84 +6,83 @@
 class UneditableTest extends FormerTests
 {
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Matches a plain label
-   *
-   * @return array
-   */
-  public function matchPlainLabel()
-  {
-    return array(
-      'tag' => 'label',
-      'attributes' => array('for' => 'foo'),
-    );
-  }
+	/**
+	 * Matches a plain label
+	 *
+	 * @return array
+	 */
+	public function matchPlainLabel()
+	{
+		return array(
+			'tag'        => 'label',
+			'attributes' => array('for' => 'foo'),
+		);
+	}
 
-  /**
-   * Matches an uneditable input
-   *
-   * @return array
-   */
-  public function matchUneditableInput()
-  {
-    return array(
-      'tag' => 'input',
-      'attributes' => array(
-        'disabled' => 'true',
-        'type'     => 'text',
-        'name'     => 'foo',
-        'value'    => 'bar',
-        'id'       => 'foo',
-      ),
-    );
-  }
+	/**
+	 * Matches an uneditable input
+	 *
+	 * @return array
+	 */
+	public function matchUneditableInput()
+	{
+		return array(
+			'tag'        => 'input',
+			'attributes' => array(
+				'disabled' => 'true',
+				'type'     => 'text',
+				'name'     => 'foo',
+				'value'    => 'bar',
+				'id'       => 'foo',
+			),
+		);
+	}
 
-  /**
-   * Matches an uneditable input as a span
-   *
-   * @return [type] [description]
-   */
-  public function matchUneditableSpan()
-  {
-    return array(
-      'tag' => 'span',
-      'content' => 'bar',
-      'attributes' => array(
-        'class' => 'uneditable-input',
-      ),
-    );
-  }
+	/**
+	 * Matches an uneditable input as a span
+	 *
+	 * @return [type] [description]
+	 */
+	public function matchUneditableSpan()
+	{
+		return array(
+			'tag'        => 'span',
+			'content'    => 'bar',
+			'attributes' => array(
+				'class' => 'uneditable-input',
+			),
+		);
+	}
 
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  public function testCanCreateClassicDisabledFields()
-  {
-    $this->former->framework('Nude');
-    $nude = $this->former->uneditable('foo')->value('bar')->__toString();
+	public function testCanCreateClassicDisabledFields()
+	{
+		$this->former->framework('Nude');
+		$nude = $this->former->uneditable('foo')->value('bar')->__toString();
 
-    $this->assertHTML($this->matchPlainLabel(), $nude);
-    $this->assertHTML($this->matchUneditableInput(), $nude);
+		$this->assertHTML($this->matchPlainLabel(), $nude);
+		$this->assertHTML($this->matchUneditableInput(), $nude);
 
-    $this->resetLabels();
-    $this->former->framework('ZurbFoundation');
-    $zurb = $this->former->uneditable('foo')->value('bar')->__toString();
+		$this->resetLabels();
+		$this->former->framework('ZurbFoundation');
+		$zurb = $this->former->uneditable('foo')->value('bar')->__toString();
 
-    $this->assertHTML($this->matchPlainLabel(), $zurb);
-    $this->assertHTML($this->matchUneditableInput(), $zurb);
-  }
+		$this->assertHTML($this->matchPlainLabel(), $zurb);
+		$this->assertHTML($this->matchUneditableInput(), $zurb);
+	}
 
-  public function testCanCreateUneditableFieldsWithBootstrap()
-  {
-    $input = $this->former->uneditable('foo')->value('bar')->__toString();
-
-    $this->assertControlGroup($input);
-    $this->assertHTML($this->matchUneditableSpan(), $input);
-  }
+	public function testCanCreateUneditableFieldsWithBootstrap()
+	{
+		$input = $this->former->uneditable('foo')->value('bar')->__toString();
 
+		$this->assertControlGroup($input);
+		$this->assertHTML($this->matchUneditableSpan(), $input);
+	}
 }
diff --git a/tests/FormTest.php b/tests/FormTest.php
index 37b9c2f6..2871d3a0 100644
--- a/tests/FormTest.php
+++ b/tests/FormTest.php
@@ -5,316 +5,323 @@
 
 class FormTest extends FormerTests
 {
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function matchForm($class = 'horizontal', $files = false, $action = '#')
-  {
-    if(in_array($class, array('horizontal', 'inline', 'vertical', 'search'))) $class = 'form-'.$class;
-
-    $matcher = array(
-      'tag' => 'form',
-      'attributes' => array(
-        'class' => $class,
-        'method' => 'POST',
-        'accept-charset' => 'utf-8',
-        'action' => $action,
-      ),
-    );
-
-    if ($files) $matcher['attributes']['enctype'] = 'multipart/form-data';
-    return $matcher;
-  }
-
-  public function createMatcher($class = 'horizontal', $forFiles = false, $action = '#')
-  {
-    if(in_array($class, array('horizontal', 'inline', 'vertical', 'search'))) $class = 'form-'.$class;
-    $forFiles = $forFiles ? 'enctype="multipart/form-data" ' : null;
-    $action = $action ? 'action="' .$action. '" ' : null;
-
-    return '<form ' .$forFiles. 'class="' .$class. '" method="POST" ' .$action. 'accept-charset="UTF-8">';
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanOpenAClassicForm()
-  {
-    $open = $this->former->open('#')->__toString();
-    $matcher = $this->matchForm();
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanOpenAFormWithoutAction()
-  {
-    $open = $this->former->open()->__toString();
-    $matcher = $this->matchForm('horizontal', false, false);
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanCloseAForm()
-  {
-    $close = $this->former->close();
-
-    $this->assertEquals('<input type="hidden" name="_token" value="csrf_token"></form>', $close);
-  }
-
-  public function testDoesntAddTokenToGetForms()
-  {
-    $open  = $this->former->open()->method('GET');
-    $close = $this->former->close();
-
-    $this->assertEquals('</form>', $close);
-  }
-
-  public function testCanCreateCustomFormOpener()
-  {
-    $open = $this->former->open('#', 'GET', $this->testAttributes)->__toString();
-    $matcher = $this->matchForm('foo form-horizontal');
-    $matcher['attributes']['method'] = 'GET';
-    $matcher['attributes']['data-foo'] = 'bar';
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanCreateHorizontalForm()
-  {
-    $open = $this->former->horizontal_open('#')->__toString();
-    $matcher = $this->matchForm();
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanCreateVerticalForm()
-  {
-    $open = $this->former->vertical_open('#')->__toString();
-    $matcher = $this->matchForm('vertical');
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanCreateSearchForm()
-  {
-    $open = $this->former->search_open('#')->__toString();
-    $matcher = $this->matchForm('search');
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanCreateInlineForm()
-  {
-    $open = $this->former->inline_open('#')->__toString();
-    $matcher = $this->matchForm('inline');
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanCreateFilesForm()
-  {
-    $open = $this->former->open_for_files('#')->__toString();
-    $matcher = $this->matchForm('horizontal', true);
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  // Combining features
-
-  public function testCanCreateAnInlineFilesForm()
-  {
-    $open = $this->former->inline_open_for_files('#')->__toString();
-    $matcher = $this->matchForm('inline', true);
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanCreateAnInlineSecureFilesForm()
-  {
-    $open = $this->former->inline_secure_open_for_files('#')->__toString();
-    $matcher = $this->matchForm('inline', true);
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testCanChainMethods()
-  {
-    $open1 = $this->former->open('test')->secure()->addClass('foo')->method('GET')->__toString();
-    $open2 = $this->former->horizontal_open('#')->class('form-vertical bar')->__toString();
-
-    $matcher1 = $this->matchForm('form-horizontal foo', false, 'https://test/en/test');
-    $matcher1['attributes']['method'] = 'GET';
-    $matcher2 = $this->matchForm('form-vertical bar');
-
-    $this->assertHTML($matcher1, $open1);
-    $this->assertHTML($matcher2, $open2);
-  }
-
-  public function testCanDirectlyAddRulesToAForm()
-  {
-    // Check form opener
-    $open = $this->former->open('#')->rules(array('foo' => 'required'))->addClass('foo')->__toString();
-    $matcher = $this->matchForm('form-horizontal foo');
-    $this->assertHTML($matcher, $open);
-
-    // Check field
-    $input = $this->former->text('foo')->__toString();
-    $label = $this->matchLabel('Foo', 'foo', true);
-
-    $this->assertHTML($this->matchField(array('required' => 'true')), $input);
-    $this->assertHTML($label, $input);
-  }
-
-  public function testCanChainAttributes()
-  {
-    $open = $this->former->open()->method('GET')->id('form')->action('#')->addClass('foo')->__toString();
-    $matcher = $this->matchForm('form-horizontal foo');
-    $matcher['id'] = 'form';
-    $matcher['attributes']['method'] = 'GET';
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testInlineFormsAreRecognized()
-  {
-    $open = $this->former->inline_open()->render();
-    $field = $this->former->text('foo');
-
-    $this->assertHTML($this->matchField(), $field->__toString());
-  }
-
-  public function testCanSetNameOnFormOpeners()
-  {
-    $form = $this->former->open('#')->name('foo');
-    $matcher = $this->matchForm();
-    $matcher['attributes']['name'] = 'foo';
-
-    $this->assertHTML($matcher, $form);
-  }
-
-  public function testDifferentFormsCanPopulateDifferentValues()
-  {
-    $this->former->populate(array('foo' => 'eatshitanddie'));
-
-    $this->former->open('#')->populate(array('foo' => 'bar'));
-      $field = $this->former->text('foo');
-    $this->former->close();
-
-    $this->former->open('#')->populate(array('foo' => 'foo'));
-      $fieldTwo = $this->former->text('foo');
-    $this->former->close();
-
-    $this->assertEquals('bar', $field->getValue());
-    $this->assertEquals('foo', $fieldTwo->getValue());
-  }
-
-  public function testPopulateReturnsFormOpener()
-  {
-    $form = $this->former->open('#')->populate(array());
-
-    $this->assertHTML($this->matchForm(), $form);
-  }
-
-  public function provideMethods()
-  {
-    return array(
-      array('PUT'),
-      array('PATCH'),
-      array('DELETE'),
-    );
-  }
-
-  /**
-   * @dataProvider provideMethods
-   */
-  public function testCanOpenToSpoofedMethod($method)
-  {
-    $form = $this->former->open('#')->method($method)->__toString();
-    $matcher = $this->matchForm();
-
-    $this->assertHTML($matcher, $form);
-    $this->assertHTML(array(
-      'tag' => 'input',
-      'attributes' => array(
-        'type'  => 'hidden',
-        'name'  => '_method',
-        'value' => $method,
-      ),
-    ), $form);
-  }
-
-  public function testCanOpenAFormToRoute()
-  {
-    $form = $this->former->open()->route('user.edit', array(2));
-    $formSingle = $this->former->open()->route('user.edit', 2);
-
-    $matcher = $this->matchForm('horizontal', false, '/users/2/edit');
-    $this->assertHTML($matcher, $form);
-    $this->assertHTML($matcher, $formSingle);
-  }
-
-  public function testCanOpenFormToAControllerMethod()
-  {
-    $form = $this->former->open()->controller('UsersController@edit', array(2));
-    $formSingle = $this->former->open()->controller('UsersController@edit', 2);
-
-    $matcher = $this->matchForm('horizontal', false, '/users/2/edit');
-    $this->assertHTML($matcher, $form);
-    $this->assertHTML($matcher, $formSingle);
-  }
-
-  public function testFormCanHaveDifferentFrameworkFromMain()
-  {
-    $form = $this->former->raw_open();
-
-    $this->assertEquals('TwitterBootstrap', $this->app['former.framework']->current());
-    $this->assertEquals('Nude', $this->app['former.form.framework']->current());
-
-    $this->former->framework('Nude');
-    $this->assertEquals('Nude', $this->app['former.framework']->current());
-    $this->assertEquals('Nude', $this->app['former.form.framework']->current());
-
-    $this->former->framework('TwitterBootstrap');
-    $this->assertEquals('TwitterBootstrap', $this->app['former.framework']->current());
-    $this->assertEquals('Nude', $this->app['former.form.framework']->current());
-  }
-
-  public function testCanOpenRawForm()
-  {
-    $this->former->framework('TwitterBootstrap3');
-
-    $form  = $this->former->raw_open();
-    $form .= $this->former->text('foo');
-    $form .= $this->former->actions()->large_submit('Submit');
-    $form .= $this->former->close();
-
-    $matcher =
-      '<form accept-charset="utf-8" method="POST">'.
-      '<input id="foo" type="text" name="foo">'.
-      '<div><input class="large" type="submit" value="Submit"></div>'.
-      '<input type="hidden" name="_token" value="csrf_token">'.
-      '</form>';
-
-    $this->assertEquals($matcher, $form);
-  }
-
-  public function testCanOpenFormWithCamelCase()
-  {
-    $open = $this->former->verticalOpen('#')->__toString();
-    $matcher = $this->matchForm('vertical');
-
-    $this->assertHTML($matcher, $open);
-  }
-
-  public function testClosingFormRemovesFrameworkInstance()
-  {
-    $form = $this->former->raw_open();
-    $this->assertEquals('TwitterBootstrap', $this->app['former.framework']->current());
-    $this->assertEquals('Nude', $this->app['former.form.framework']->current());
-    $this->former->close();
-
-    $this->assertFalse($this->app->bound('former.form.framework'));
-  }
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function matchForm($class = 'horizontal', $files = false, $action = '#')
+	{
+		if (in_array($class, array('horizontal', 'inline', 'vertical', 'search'))) {
+			$class = 'form-'.$class;
+		}
+
+		$matcher = array(
+			'tag'        => 'form',
+			'attributes' => array(
+				'class'          => $class,
+				'method'         => 'POST',
+				'accept-charset' => 'utf-8',
+				'action'         => $action,
+			),
+		);
+
+		if ($files) {
+			$matcher['attributes']['enctype'] = 'multipart/form-data';
+		}
+
+		return $matcher;
+	}
+
+	public function createMatcher($class = 'horizontal', $forFiles = false, $action = '#')
+	{
+		if (in_array($class, array('horizontal', 'inline', 'vertical', 'search'))) {
+			$class = 'form-'.$class;
+		}
+		$forFiles = $forFiles ? 'enctype="multipart/form-data" ' : null;
+		$action   = $action ? 'action="'.$action.'" ' : null;
+
+		return '<form '.$forFiles.'class="'.$class.'" method="POST" '.$action.'accept-charset="UTF-8">';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanOpenAClassicForm()
+	{
+		$open    = $this->former->open('#')->__toString();
+		$matcher = $this->matchForm();
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanOpenAFormWithoutAction()
+	{
+		$open    = $this->former->open()->__toString();
+		$matcher = $this->matchForm('horizontal', false, false);
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanCloseAForm()
+	{
+		$close = $this->former->close();
+
+		$this->assertEquals('<input type="hidden" name="_token" value="csrf_token"></form>', $close);
+	}
+
+	public function testDoesntAddTokenToGetForms()
+	{
+		$open  = $this->former->open()->method('GET');
+		$close = $this->former->close();
+
+		$this->assertEquals('</form>', $close);
+	}
+
+	public function testCanCreateCustomFormOpener()
+	{
+		$open                              = $this->former->open('#', 'GET', $this->testAttributes)->__toString();
+		$matcher                           = $this->matchForm('foo form-horizontal');
+		$matcher['attributes']['method']   = 'GET';
+		$matcher['attributes']['data-foo'] = 'bar';
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanCreateHorizontalForm()
+	{
+		$open    = $this->former->horizontal_open('#')->__toString();
+		$matcher = $this->matchForm();
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanCreateVerticalForm()
+	{
+		$open    = $this->former->vertical_open('#')->__toString();
+		$matcher = $this->matchForm('vertical');
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanCreateSearchForm()
+	{
+		$open    = $this->former->search_open('#')->__toString();
+		$matcher = $this->matchForm('search');
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanCreateInlineForm()
+	{
+		$open    = $this->former->inline_open('#')->__toString();
+		$matcher = $this->matchForm('inline');
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanCreateFilesForm()
+	{
+		$open    = $this->former->open_for_files('#')->__toString();
+		$matcher = $this->matchForm('horizontal', true);
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	// Combining features
+
+	public function testCanCreateAnInlineFilesForm()
+	{
+		$open    = $this->former->inline_open_for_files('#')->__toString();
+		$matcher = $this->matchForm('inline', true);
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanCreateAnInlineSecureFilesForm()
+	{
+		$open    = $this->former->inline_secure_open_for_files('#')->__toString();
+		$matcher = $this->matchForm('inline', true);
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testCanChainMethods()
+	{
+		$open1 = $this->former->open('test')->secure()->addClass('foo')->method('GET')->__toString();
+		$open2 = $this->former->horizontal_open('#')->class('form-vertical bar')->__toString();
+
+		$matcher1                         = $this->matchForm('form-horizontal foo', false, 'https://test/en/test');
+		$matcher1['attributes']['method'] = 'GET';
+		$matcher2                         = $this->matchForm('form-vertical bar');
+
+		$this->assertHTML($matcher1, $open1);
+		$this->assertHTML($matcher2, $open2);
+	}
+
+	public function testCanDirectlyAddRulesToAForm()
+	{
+		// Check form opener
+		$open    = $this->former->open('#')->rules(array('foo' => 'required'))->addClass('foo')->__toString();
+		$matcher = $this->matchForm('form-horizontal foo');
+		$this->assertHTML($matcher, $open);
+
+		// Check field
+		$input = $this->former->text('foo')->__toString();
+		$label = $this->matchLabel('Foo', 'foo', true);
+
+		$this->assertHTML($this->matchField(array('required' => 'true')), $input);
+		$this->assertHTML($label, $input);
+	}
+
+	public function testCanChainAttributes()
+	{
+		$open                            = $this->former->open()->method('GET')->id('form')->action('#')->addClass('foo')->__toString();
+		$matcher                         = $this->matchForm('form-horizontal foo');
+		$matcher['id']                   = 'form';
+		$matcher['attributes']['method'] = 'GET';
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testInlineFormsAreRecognized()
+	{
+		$open  = $this->former->inline_open()->render();
+		$field = $this->former->text('foo');
+
+		$this->assertHTML($this->matchField(), $field->__toString());
+	}
+
+	public function testCanSetNameOnFormOpeners()
+	{
+		$form                          = $this->former->open('#')->name('foo');
+		$matcher                       = $this->matchForm();
+		$matcher['attributes']['name'] = 'foo';
+
+		$this->assertHTML($matcher, $form);
+	}
+
+	public function testDifferentFormsCanPopulateDifferentValues()
+	{
+		$this->former->populate(array('foo' => 'eatshitanddie'));
+
+		$this->former->open('#')->populate(array('foo' => 'bar'));
+		$field = $this->former->text('foo');
+		$this->former->close();
+
+		$this->former->open('#')->populate(array('foo' => 'foo'));
+		$fieldTwo = $this->former->text('foo');
+		$this->former->close();
+
+		$this->assertEquals('bar', $field->getValue());
+		$this->assertEquals('foo', $fieldTwo->getValue());
+	}
+
+	public function testPopulateReturnsFormOpener()
+	{
+		$form = $this->former->open('#')->populate(array());
+
+		$this->assertHTML($this->matchForm(), $form);
+	}
+
+	public function provideMethods()
+	{
+		return array(
+			array('PUT'),
+			array('PATCH'),
+			array('DELETE'),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMethods
+	 */
+	public function testCanOpenToSpoofedMethod($method)
+	{
+		$form    = $this->former->open('#')->method($method)->__toString();
+		$matcher = $this->matchForm();
+
+		$this->assertHTML($matcher, $form);
+		$this->assertHTML(array(
+			'tag'        => 'input',
+			'attributes' => array(
+				'type'  => 'hidden',
+				'name'  => '_method',
+				'value' => $method,
+			),
+		), $form);
+	}
+
+	public function testCanOpenAFormToRoute()
+	{
+		$form       = $this->former->open()->route('user.edit', array(2));
+		$formSingle = $this->former->open()->route('user.edit', 2);
+
+		$matcher = $this->matchForm('horizontal', false, '/users/2/edit');
+		$this->assertHTML($matcher, $form);
+		$this->assertHTML($matcher, $formSingle);
+	}
+
+	public function testCanOpenFormToAControllerMethod()
+	{
+		$form       = $this->former->open()->controller('UsersController@edit', array(2));
+		$formSingle = $this->former->open()->controller('UsersController@edit', 2);
+
+		$matcher = $this->matchForm('horizontal', false, '/users/2/edit');
+		$this->assertHTML($matcher, $form);
+		$this->assertHTML($matcher, $formSingle);
+	}
+
+	public function testFormCanHaveDifferentFrameworkFromMain()
+	{
+		$form = $this->former->raw_open();
+
+		$this->assertEquals('TwitterBootstrap', $this->app['former.framework']->current());
+		$this->assertEquals('Nude', $this->app['former.form.framework']->current());
+
+		$this->former->framework('Nude');
+		$this->assertEquals('Nude', $this->app['former.framework']->current());
+		$this->assertEquals('Nude', $this->app['former.form.framework']->current());
+
+		$this->former->framework('TwitterBootstrap');
+		$this->assertEquals('TwitterBootstrap', $this->app['former.framework']->current());
+		$this->assertEquals('Nude', $this->app['former.form.framework']->current());
+	}
+
+	public function testCanOpenRawForm()
+	{
+		$this->former->framework('TwitterBootstrap3');
+
+		$form = $this->former->raw_open();
+		$form .= $this->former->text('foo');
+		$form .= $this->former->actions()->large_submit('Submit');
+		$form .= $this->former->close();
+
+		$matcher =
+			'<form accept-charset="utf-8" method="POST">'.
+			'<input id="foo" type="text" name="foo">'.
+			'<div><input class="large" type="submit" value="Submit"></div>'.
+			'<input type="hidden" name="_token" value="csrf_token">'.
+			'</form>';
+
+		$this->assertEquals($matcher, $form);
+	}
+
+	public function testCanOpenFormWithCamelCase()
+	{
+		$open    = $this->former->verticalOpen('#')->__toString();
+		$matcher = $this->matchForm('vertical');
+
+		$this->assertHTML($matcher, $open);
+	}
+
+	public function testClosingFormRemovesFrameworkInstance()
+	{
+		$form = $this->former->raw_open();
+		$this->assertEquals('TwitterBootstrap', $this->app['former.framework']->current());
+		$this->assertEquals('Nude', $this->app['former.form.framework']->current());
+		$this->former->close();
+
+		$this->assertFalse($this->app->bound('former.form.framework'));
+	}
 }
diff --git a/tests/FormerTest.php b/tests/FormerTest.php
index 5dc870f7..8d3ec197 100644
--- a/tests/FormerTest.php
+++ b/tests/FormerTest.php
@@ -1,109 +1,109 @@
 <?php
 namespace Former;
 
-use Former\TestCases\FormerTests;
 use Former\Facades\Former;
+use Former\TestCases\FormerTests;
 
 class FormerTest extends FormerTests
 {
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function matchLegend()
-  {
-    return array(
-      'tag'        => 'legend',
-      'content'    => 'Test',
-      'attributes' => $this->testAttributes,
-    );
-  }
-
-  public function matchToken()
-  {
-    return array(
-      'tag' => 'input',
-      'attributes' => array(
-        'type'  => 'hidden',
-        'name'  => '_token',
-        'value' => 'csrf_token',
-      ),
-    );
-  }
-
-  public function matchLabel($name = 'foo', $field = 'foo', $required = false)
-  {
-    return array(
-      'tag'        => 'label',
-      'content'    => 'Foo',
-      'attributes' => array('for' => '')
-    );
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanCreateFormLegends()
-  {
-    $legend = $this->former->legend('test', $this->testAttributes);
-
-    $this->assertHTML($this->matchLegend(), $legend);
-  }
-
-  public function testCanCreateFormLabels()
-  {
-    $label = $this->former->label('foo');
-
-    $this->assertLabel($label);
-  }
-
-  public function testCanCreateCsrfTokens()
-  {
-    $token = $this->former->token();
-
-    $this->assertHTML($this->matchToken(), $token);
-  }
-
-  public function testCanCreateFormMacros()
-  {
-    $former = $this->former;
-    $this->former->macro('captcha', function ($name = null) use ($former) {
-      return $former->text($name)->raw();
-    });
-
-    $this->assertEquals($this->former->text('foo')->raw(), $this->former->captcha('foo'));
-    $this->assertHTML($this->matchField(), $this->former->captcha('foo'));
-  }
-
-  public function testCanUseClassesAsMacros()
-  {
-    $this->former->macro('loltext', 'Former\Dummy\DummyMacros@loltext');
-
-    $this->assertEquals('lolfoobar', $this->former->loltext('foobar'));
-  }
-
-  public function testMacrosDontTakePrecedenceOverNativeFields()
-  {
-    $former = $this->former;
-    $this->former->macro('label', function () use ($former) {
-      return 'NOPE';
-    });
-
-    $this->assertNotEquals('NOPE', $this->former->label('foo'));
-  }
-
-  public function testCloseCorrectlyRemoveInstances()
-  {
-    $this->former->close();
-
-    $this->assertFalse($this->app->bound('former.form'));
-  }
-
-  public function testCanUseFacadeWithoutContainer()
-  {
-    $text = Former::text('foo')->render();
-
-    $this->assertEquals('<input id="foo" type="text" name="foo">', $text);
-  }
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function matchLegend()
+	{
+		return array(
+			'tag'        => 'legend',
+			'content'    => 'Test',
+			'attributes' => $this->testAttributes,
+		);
+	}
+
+	public function matchToken()
+	{
+		return array(
+			'tag'        => 'input',
+			'attributes' => array(
+				'type'  => 'hidden',
+				'name'  => '_token',
+				'value' => 'csrf_token',
+			),
+		);
+	}
+
+	public function matchLabel($name = 'foo', $field = 'foo', $required = false)
+	{
+		return array(
+			'tag'        => 'label',
+			'content'    => 'Foo',
+			'attributes' => array('for' => '')
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanCreateFormLegends()
+	{
+		$legend = $this->former->legend('test', $this->testAttributes);
+
+		$this->assertHTML($this->matchLegend(), $legend);
+	}
+
+	public function testCanCreateFormLabels()
+	{
+		$label = $this->former->label('foo');
+
+		$this->assertLabel($label);
+	}
+
+	public function testCanCreateCsrfTokens()
+	{
+		$token = $this->former->token();
+
+		$this->assertHTML($this->matchToken(), $token);
+	}
+
+	public function testCanCreateFormMacros()
+	{
+		$former = $this->former;
+		$this->former->macro('captcha', function ($name = null) use ($former) {
+			return $former->text($name)->raw();
+		});
+
+		$this->assertEquals($this->former->text('foo')->raw(), $this->former->captcha('foo'));
+		$this->assertHTML($this->matchField(), $this->former->captcha('foo'));
+	}
+
+	public function testCanUseClassesAsMacros()
+	{
+		$this->former->macro('loltext', 'Former\Dummy\DummyMacros@loltext');
+
+		$this->assertEquals('lolfoobar', $this->former->loltext('foobar'));
+	}
+
+	public function testMacrosDontTakePrecedenceOverNativeFields()
+	{
+		$former = $this->former;
+		$this->former->macro('label', function () use ($former) {
+			return 'NOPE';
+		});
+
+		$this->assertNotEquals('NOPE', $this->former->label('foo'));
+	}
+
+	public function testCloseCorrectlyRemoveInstances()
+	{
+		$this->former->close();
+
+		$this->assertFalse($this->app->bound('former.form'));
+	}
+
+	public function testCanUseFacadeWithoutContainer()
+	{
+		$text = Former::text('foo')->render();
+
+		$this->assertEquals('<input id="foo" type="text" name="foo">', $text);
+	}
 }
diff --git a/tests/Framework/FrameworkTest.php b/tests/Framework/FrameworkTest.php
index 45fedcc5..b696df9c 100644
--- a/tests/Framework/FrameworkTest.php
+++ b/tests/Framework/FrameworkTest.php
@@ -5,28 +5,28 @@
 
 class FrameworkTest extends FormerTests
 {
-  public function testCanChangeFramework()
-  {
-    $this->former->framework('ZurbFoundation');
+	public function testCanChangeFramework()
+	{
+		$this->former->framework('ZurbFoundation');
 
-    $this->assertEquals('ZurbFoundation', $this->former->framework());
-  }
+		$this->assertEquals('ZurbFoundation', $this->former->framework());
+	}
 
-  public function testCanCheckWhatTheFrameworkIs()
-  {
-    $current   = $this->app['former.framework']->current();
-    $isCurrent = $this->app['former.framework']->is($current);
+	public function testCanCheckWhatTheFrameworkIs()
+	{
+		$current   = $this->app['former.framework']->current();
+		$isCurrent = $this->app['former.framework']->is($current);
 
-    $this->assertTrue($isCurrent);
-  }
+		$this->assertTrue($isCurrent);
+	}
 
-  public function testCanCreateFieldOutsideOfForm()
-  {
-    $this->former->closeGroup();
-    $this->former->close();
+	public function testCanCreateFieldOutsideOfForm()
+	{
+		$this->former->closeGroup();
+		$this->former->close();
 
-    $text = $this->former->text('foobar')->__toString();
+		$text = $this->former->text('foobar')->__toString();
 
-    $this->assertEquals('<label for="foobar">Foobar</label><input id="foobar" type="text" name="foobar">', $text);
-  }
+		$this->assertEquals('<label for="foobar">Foobar</label><input id="foobar" type="text" name="foobar">', $text);
+	}
 }
diff --git a/tests/Framework/NudeFrameworkTest.php b/tests/Framework/NudeFrameworkTest.php
index 7f650d0f..f7baad56 100644
--- a/tests/Framework/NudeFrameworkTest.php
+++ b/tests/Framework/NudeFrameworkTest.php
@@ -6,30 +6,29 @@
 class NudeFrameworkTest extends FormerTests
 {
 
-  public function setUp()
-  {
-    parent::setUp();
-
-    $this->former->framework('Nude');
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-    public function testCanDisplayErrorMessages()
-    {
-    // Create field
-    $this->former->withErrors($this->validator);
-    $required = $this->former->text('required')->wrapAndRender();
-
-    // Matcher
-    $matcher =
-        '<label for="required">Required</label>'.
-        '<input id="required" type="text" name="required">'.
-        '<span class="help">The required field is required.</span>';
-
-    $this->assertEquals($matcher, $required);
-    }
-
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->former->framework('Nude');
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanDisplayErrorMessages()
+	{
+		// Create field
+		$this->former->withErrors($this->validator);
+		$required = $this->former->text('required')->wrapAndRender();
+
+		// Matcher
+		$matcher =
+			'<label for="required">Required</label>'.
+			'<input id="required" type="text" name="required">'.
+			'<span class="help">The required field is required.</span>';
+
+		$this->assertEquals($matcher, $required);
+	}
 }
diff --git a/tests/Framework/TwitterBootstrap3Test.php b/tests/Framework/TwitterBootstrap3Test.php
index fe8e0ea4..97c24fe0 100644
--- a/tests/Framework/TwitterBootstrap3Test.php
+++ b/tests/Framework/TwitterBootstrap3Test.php
@@ -3,203 +3,209 @@
 
 use Former\TestCases\FormerTests;
 
-
 class TwitterBootstrap3Test extends FormerTests
 {
 
-  public function setUp()
-  {
-    parent::setUp();
-
-    $this->former->framework('TwitterBootstrap3');
-    $this->former->horizontal_open()->__toString();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function hmatch($label, $field)
-  {
-    return '<div class="form-group">'.$label.'<div class="col-lg-10 col-sm-8">'.$field.'</div></div>';
-  }
-
-  public function vmatch($label, $field)
-  {
-    return '<div class="form-group">'.$label.$field.'</div>';
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testFrameworkIsRecognized()
-  {
-    $this->assertNotEquals('TwitterBootstrap', $this->former->framework());
-    $this->assertEquals('TwitterBootstrap3', $this->former->framework());
-  }
-
-  public function testVerticalFormFieldsDontInheritHorizontalMarkup()
-  {
-    $this->former->open_vertical();
-    $field = $this->former->text('foo')->__toString();
-    $this->former->close();
-
-    $match = $this->vmatch('<label for="foo" class="control-label">Foo</label>',
-                           '<input class="form-control" id="foo" type="text" name="foo">');
-
-    $this->assertEquals($match, $field);
-  }
-
-  public function testHorizontalFormWithDefaultLabelWidths()
-  {
-    $field = $this->former->text('foo')->__toString();
-    $match = $this->hmatch('<label for="foo" class="control-label col-lg-2 col-sm-4">Foo</label>',
-                           '<input class="form-control" id="foo" type="text" name="foo">');
-
-    $this->assertEquals($match, $field);
-  }
-
-  public function testPrependIcon()
-  {
-    $this->former->open_vertical();
-    $icon = $this->former->text('foo')->prependIcon('ok')->__toString();
-    $match = $this->vmatch('<label for="foo" class="control-label">Foo</label>',
-                           '<div class="input-group">'.
-                             '<span class="input-group-addon"><span class="glyphicon glyphicon-ok"></span></span>'.
-                             '<input class="form-control" id="foo" type="text" name="foo">'.
-                           '</div>');
-
-    $this->assertEquals($match, $icon);
-  }
-
-  public function testAppendIcon()
-  {
-    $this->former->open_vertical();
-    $icon = $this->former->text('foo')->appendIcon('ok')->__toString();
-    $match = $this->vmatch('<label for="foo" class="control-label">Foo</label>',
-                           '<div class="input-group">'.
-                             '<input class="form-control" id="foo" type="text" name="foo">'.
-                             '<span class="input-group-addon"><span class="glyphicon glyphicon-ok"></span></span>'.
-                           '</div>');
-    $this->assertEquals($match, $icon);
-  }
-
-  public function testTextFieldsGetControlClass()
-  {
-    $this->former->open_vertical();
-    $field = $this->former->text('foo')->__toString();
-    $match =  $this->vmatch('<label for="foo" class="control-label">Foo</label>',
-                            '<input class="form-control" id="foo" type="text" name="foo">');
-
-    $this->assertEquals($match, $field);
-  }
-
-  public function testButtonSizes()
-  {
-    $this->former->open_vertical();
-    $buttons = $this->former->actions()->lg_submit('Submit')->submit('Submit')->sm_submit('Submit')->xs_submit('Submit')->__toString();
-    $match = '<div>'.
-               '<input class="btn-lg btn" type="submit" value="Submit">'.
-               ' <input class="btn" type="submit" value="Submit">'.
-               ' <input class="btn-sm btn" type="submit" value="Submit">'.
-               ' <input class="btn-xs btn" type="submit" value="Submit">'.
-             '</div>';
-
-    $this->assertEquals($match, $buttons);
-  }
-
-  public function testCanOverrideFrameworkIconSettings()
-  {
-    // e.g. using other Glyphicon sets
-    $icon1 = $this->app['former.framework']->createIcon('facebook', null, array('set'=>'social','prefix'=>'glyphicon'))->__toString();
-    $match1 = '<span class="social glyphicon-facebook"></span>';
-
-    $this->assertEquals($match1, $icon1);
-
-    // e.g using Font-Awesome circ v3.2.1
-    $icon2 = $this->app['former.framework']->createIcon('flag', null, array('tag'=>'i', 'set' => '', 'prefix'=>'icon'))->__toString();
-    $match2 = '<i class="icon-flag"></i>';
-
-    $this->assertEquals($match2, $icon2);
-  }
-
-  public function testCanCreateWithErrors()
-  {
-    $this->former->open_vertical();
-    $this->former->withErrors($this->validator);
-
-    $required = $this->former->text('required')->__toString();
-    $matcher =
-    '<div class="form-group has-error">'.
-      '<label for="required" class="control-label">Required</label>'.
-      '<input class="form-control" id="required" type="text" name="required">'.
-      '<span class="help-block">The required field is required.</span>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $required);
-  }
-
-  public function testAddScreenReaderClassToInlineFormLabels()
-  {
-    $this->former->open_inline();
-
-    $field = $this->former->text('foo')->__toString();
-
-    $match =
-    '<div class="form-group">'.
-      '<label for="foo" class="sr-only">Foo</label>'.
-      '<input class="form-control" id="foo" type="text" name="foo">'.
-    '</div>';
-
-    $this->assertEquals($match, $field);
-    $this->assertEquals($match, $field);
-
-    $this->former->close();
-  }
-
-  public function testHeightSettingForFields()
-  {
-    $this->former->open_vertical();
-
-    $field = $this->former->lg_text('foo')->__toString();
-    $match =
-    '<div class="form-group">'.
-      '<label for="foo" class="control-label">Foo</label>'.
-      '<input class="input-lg form-control" id="foo" type="text" name="foo">'.
-    '</div>';
-    $this->assertEquals($match, $field);
-
-    $this->resetLabels();
-    $field = $this->former->sm_select('foo')->__toString();
-    $match =
-    '<div class="form-group">'.
-      '<label for="foo" class="control-label">Foo</label>'.
-      '<select class="input-sm form-control" id="foo" name="foo"></select>'.
-    '</div>';
-    $this->assertEquals($match, $field);
-
-    $this->former->close();
-  }
-
-  public function testAddFormControlClassToInlineActionsBlock()
-  {
-    $this->former->open_inline();
-    $buttons = $this->former->actions()->submit('Foo')->__toString();
-    $match = '<div class="form-group">'.
-               '<input class="btn" type="submit" value="Foo">'.
-             '</div>';
-
-    $this->assertEquals($match, $buttons);
-
-    $this->former->close();
-  }
-
-  public function testButtonsAreWrappedInSpecialClass()
-  {
-    $button = $this->former->text('foo')->append($this->former->button('Search'))->wrapAndRender();
-    $matcher = '<span class="input-group-btn"><button class="btn" type="button">Search</button></span>';
-
-    $this->assertContains($matcher, $button);
-  }
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->former->framework('TwitterBootstrap3');
+		$this->former->horizontal_open()->__toString();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function hmatch($label, $field)
+	{
+		return '<div class="form-group">'.$label.'<div class="col-lg-10 col-sm-8">'.$field.'</div></div>';
+	}
+
+	public function vmatch($label, $field)
+	{
+		return '<div class="form-group">'.$label.$field.'</div>';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testFrameworkIsRecognized()
+	{
+		$this->assertNotEquals('TwitterBootstrap', $this->former->framework());
+		$this->assertEquals('TwitterBootstrap3', $this->former->framework());
+	}
+
+	public function testVerticalFormFieldsDontInheritHorizontalMarkup()
+	{
+		$this->former->open_vertical();
+		$field = $this->former->text('foo')->__toString();
+		$this->former->close();
+
+		$match = $this->vmatch('<label for="foo" class="control-label">Foo</label>',
+			'<input class="form-control" id="foo" type="text" name="foo">');
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testHorizontalFormWithDefaultLabelWidths()
+	{
+		$field = $this->former->text('foo')->__toString();
+		$match = $this->hmatch('<label for="foo" class="control-label col-lg-2 col-sm-4">Foo</label>',
+			'<input class="form-control" id="foo" type="text" name="foo">');
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testPrependIcon()
+	{
+		$this->former->open_vertical();
+		$icon  = $this->former->text('foo')->prependIcon('ok')->__toString();
+		$match = $this->vmatch('<label for="foo" class="control-label">Foo</label>',
+			'<div class="input-group">'.
+			'<span class="input-group-addon"><span class="glyphicon glyphicon-ok"></span></span>'.
+			'<input class="form-control" id="foo" type="text" name="foo">'.
+			'</div>');
+
+		$this->assertEquals($match, $icon);
+	}
+
+	public function testAppendIcon()
+	{
+		$this->former->open_vertical();
+		$icon  = $this->former->text('foo')->appendIcon('ok')->__toString();
+		$match = $this->vmatch('<label for="foo" class="control-label">Foo</label>',
+			'<div class="input-group">'.
+			'<input class="form-control" id="foo" type="text" name="foo">'.
+			'<span class="input-group-addon"><span class="glyphicon glyphicon-ok"></span></span>'.
+			'</div>');
+		$this->assertEquals($match, $icon);
+	}
+
+	public function testTextFieldsGetControlClass()
+	{
+		$this->former->open_vertical();
+		$field = $this->former->text('foo')->__toString();
+		$match = $this->vmatch('<label for="foo" class="control-label">Foo</label>',
+			'<input class="form-control" id="foo" type="text" name="foo">');
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testButtonSizes()
+	{
+		$this->former->open_vertical();
+		$buttons = $this->former->actions()->lg_submit('Submit')->submit('Submit')->sm_submit('Submit')->xs_submit('Submit')->__toString();
+		$match   = '<div>'.
+			'<input class="btn-lg btn" type="submit" value="Submit">'.
+			' <input class="btn" type="submit" value="Submit">'.
+			' <input class="btn-sm btn" type="submit" value="Submit">'.
+			' <input class="btn-xs btn" type="submit" value="Submit">'.
+			'</div>';
+
+		$this->assertEquals($match, $buttons);
+	}
+
+	public function testCanOverrideFrameworkIconSettings()
+	{
+		// e.g. using other Glyphicon sets
+		$icon1  = $this->app['former.framework']->createIcon('facebook', null, array(
+				'set'    => 'social',
+				'prefix' => 'glyphicon'
+			))->__toString();
+		$match1 = '<span class="social glyphicon-facebook"></span>';
+
+		$this->assertEquals($match1, $icon1);
+
+		// e.g using Font-Awesome circ v3.2.1
+		$icon2  = $this->app['former.framework']->createIcon('flag', null, array(
+				'tag'    => 'i',
+				'set'    => '',
+				'prefix' => 'icon'
+			))->__toString();
+		$match2 = '<i class="icon-flag"></i>';
+
+		$this->assertEquals($match2, $icon2);
+	}
+
+	public function testCanCreateWithErrors()
+	{
+		$this->former->open_vertical();
+		$this->former->withErrors($this->validator);
+
+		$required = $this->former->text('required')->__toString();
+		$matcher  =
+			'<div class="form-group has-error">'.
+			'<label for="required" class="control-label">Required</label>'.
+			'<input class="form-control" id="required" type="text" name="required">'.
+			'<span class="help-block">The required field is required.</span>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $required);
+	}
+
+	public function testAddScreenReaderClassToInlineFormLabels()
+	{
+		$this->former->open_inline();
+
+		$field = $this->former->text('foo')->__toString();
+
+		$match =
+			'<div class="form-group">'.
+			'<label for="foo" class="sr-only">Foo</label>'.
+			'<input class="form-control" id="foo" type="text" name="foo">'.
+			'</div>';
+
+		$this->assertEquals($match, $field);
+		$this->assertEquals($match, $field);
+
+		$this->former->close();
+	}
+
+	public function testHeightSettingForFields()
+	{
+		$this->former->open_vertical();
+
+		$field = $this->former->lg_text('foo')->__toString();
+		$match =
+			'<div class="form-group">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<input class="input-lg form-control" id="foo" type="text" name="foo">'.
+			'</div>';
+		$this->assertEquals($match, $field);
+
+		$this->resetLabels();
+		$field = $this->former->sm_select('foo')->__toString();
+		$match =
+			'<div class="form-group">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<select class="input-sm form-control" id="foo" name="foo"></select>'.
+			'</div>';
+		$this->assertEquals($match, $field);
+
+		$this->former->close();
+	}
+
+	public function testAddFormControlClassToInlineActionsBlock()
+	{
+		$this->former->open_inline();
+		$buttons = $this->former->actions()->submit('Foo')->__toString();
+		$match   = '<div class="form-group">'.
+			'<input class="btn" type="submit" value="Foo">'.
+			'</div>';
+
+		$this->assertEquals($match, $buttons);
+
+		$this->former->close();
+	}
+
+	public function testButtonsAreWrappedInSpecialClass()
+	{
+		$button  = $this->former->text('foo')->append($this->former->button('Search'))->wrapAndRender();
+		$matcher = '<span class="input-group-btn"><button class="btn" type="button">Search</button></span>';
+
+		$this->assertContains($matcher, $button);
+	}
 }
diff --git a/tests/Framework/TwitterBootstrapTest.php b/tests/Framework/TwitterBootstrapTest.php
index f31cac8a..c9089bbc 100644
--- a/tests/Framework/TwitterBootstrapTest.php
+++ b/tests/Framework/TwitterBootstrapTest.php
@@ -2,55 +2,65 @@
 namespace Former\Framework;
 
 use Former\TestCases\FormerTests;
-
 use Illuminate\Support\Str;
 
-class TwitterBootstrap2Test extends FormerTests
+class TwitterBootstrapTest extends FormerTests
 {
 
-  public function setUp()
-  {
-    parent::setUp();
-
-    $this->former->framework('TwitterBootstrap');
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function createPrependAppendMatcher($prepend = array(), $append = array())
-  {
-    foreach($prepend as $k => $p) if(!Str::startsWith($p, '<button')) $prepend[$k] = '<span class="add-on">' .$p. '</span>';
-    foreach($append as $k => $a)  if(!Str::startsWith($a, '<button'))  $append[$k] = '<span class="add-on">' .$a. '</span>';
-
-    $class = array();
-    if($prepend) $class[] = "input-prepend";
-    if($append) $class[] = "input-append";
-
-    return
-    '<div class="control-group">' .
-      '<label for="foo" class="control-label">Foo</label>' .
-      '<div class="controls">' .
-        '<div class="' .implode(' ',$class). '">'.
-          join(null, $prepend).
-          '<input id="foo" type="text" name="foo">' .
-          join(null, $append).
-          '</div>'.
-      '</div>' .
-    '</div>';
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testAppendWhiteIcon()
-  {
-    $control = $this->former->text('foo')->appendIcon('white-something')->__toString();
-    $matcher = $this->createPrependAppendMatcher(array(), array('<i class="icon-white  icon-something"></i>'));
-
-    $this->assertEquals($matcher, $control);
-  }
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->former->framework('TwitterBootstrap');
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function createPrependAppendMatcher($prepend = array(), $append = array())
+	{
+		foreach ($prepend as $k => $p) {
+			if (!Str::startsWith($p, '<button')) {
+				$prepend[$k] = '<span class="add-on">'.$p.'</span>';
+			}
+		}
+		foreach ($append as $k => $a) {
+			if (!Str::startsWith($a, '<button')) {
+				$append[$k] = '<span class="add-on">'.$a.'</span>';
+			}
+		}
+
+		$class = array();
+		if ($prepend) {
+			$class[] = "input-prepend";
+		}
+		if ($append) {
+			$class[] = "input-append";
+		}
+
+		return
+			'<div class="control-group">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<div class="controls">'.
+			'<div class="'.implode(' ', $class).'">'.
+			join(null, $prepend).
+			'<input id="foo" type="text" name="foo">'.
+			join(null, $append).
+			'</div>'.
+			'</div>'.
+			'</div>';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testAppendWhiteIcon()
+	{
+		$control = $this->former->text('foo')->appendIcon('white-something')->__toString();
+		$matcher = $this->createPrependAppendMatcher(array(), array('<i class="icon-white  icon-something"></i>'));
 
+		$this->assertEquals($matcher, $control);
+	}
 }
diff --git a/tests/Framework/ZurbFramework4Test.php b/tests/Framework/ZurbFramework4Test.php
index 4c6d6534..3952726e 100644
--- a/tests/Framework/ZurbFramework4Test.php
+++ b/tests/Framework/ZurbFramework4Test.php
@@ -3,144 +3,140 @@
 
 use Former\TestCases\FormerTests;
 
-
 class ZurbFramework4Test extends FormerTests
 {
 
-  public function setUp()
-  {
-    parent::setUp();
-
-    $this->former->framework('ZurbFoundation4');
-    $this->former->horizontal_open()->__toString();
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function matchLabel($name = 'foo', $field = 'foo', $required = false)
-  {
-    return array(
-      'tag' => 'label',
-      'content' => ucfirst($name),
-      'attributes' => array(
-        'for'   => $field,
-      ),
-    );
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanUseMagicMethods()
-  {
-    $input = $this->former->large_submit('Save')->__toString();
-    $matcher = $this->matchInputButton('large button', 'Save');
-
-    $this->assertHTML($matcher, $input);
-  }
-
-  public function testCanSetAnErrorStateOnAField()
-  {
-    $input = $this->former->text('foo')->state('error')->__toString();
-    $matcher = array('tag' => 'div', 'attributes' => array('class' => 'error'));
-
-    $this->assertLabel($input);
-    $this->assertHTML($this->matchField(), $input);
-    $this->assertHTML($matcher, $input);
-  }
-
-  public function testCanAppendHelpTexts()
-  {
-    $input = $this->former->text('foo')->inlineHelp('bar')->__toString();
-    $matcher = array('tag' => 'span', 'content' => 'Bar');
-
-    $this->assertLabel($input);
-    $this->assertHTML($this->matchField(), $input);
-    $this->assertHTML($matcher, $input);
-  }
-
-  public function testCantUseBootstrapReservedMethods()
-  {
-    $this->setExpectedException('BadMethodCallException');
-
-    $this->former->text('foo')->blockHelp('bar')->__toString();
-  }
-
-  public function testCreateIconWithFrameworkSpecificIcon()
-  {
-    $icon = $this->app['former.framework']->createIcon('smiley')->__toString();
-    $match = '<i class="general foundicon-smiley"></i>';
-
-    $this->assertEquals($match, $icon);
-  }
-
-  public function testCanAppendIcon()
-  {
-    $this->former->vertical_open();
-    $input = $this->former->text('foo')->appendIcon('ok')->__toString();
-    $match = '<div>'.
-               '<label for="foo">Foo</label>'.
-               '<div class="large-10 small-9 columns">'.
-                 '<input id="foo" type="text" name="foo">'.
-               '</div>'.
-               '<div class="large-2 small-3 columns">'.
-                 '<span class="postfix">'.
-                   '<i class="general foundicon-ok"></i>'.
-                 '</span>'.
-               '</div>'.
-             '</div>';
-
-    $this->assertEquals($match, $input);
-  }
-
-  public function testCreateOverideIconSettingsWithFrameworkSpecificIcon()
-  {
-    $icon = $this->app['former.framework']->createIcon('smiley')->__toString();
-    $match = '<i class="general foundicon-smiley"></i>';
-
-    $this->assertEquals($match, $icon);
-  }
-
-  public function testVerticalFormInputField()
-  {
-    $this->former->vertical_open();
-    $field = $this->former->text('foo')->__toString();
-
-    $match = '<div>'.
-               '<label for="foo">Foo</label>'.
-               '<input id="foo" type="text" name="foo">'.
-             '</div>';
-
-    $this->assertEquals($match, $field);
-  }
-
-  public function testHorizontalFormInputField()
-  {
-    $field = $this->former->text('foo')->__toString();
-
-    $match = '<div class="row">'.
-               '<div class="small-3 columns">'.
-                 '<label for="foo" class="right inline">Foo</label>'.
-               '</div>'.
-               '<div class="small-9 columns">'.
-                 '<input id="foo" type="text" name="foo">'.
-               '</div>'.
-             '</div>';
-
-    $this->assertEquals($match, $field);
-  }
-
-  public function testHelpTextHasCorrectClasses()
-  {
-
-    $input = $this->former->text('foo')->inlineHelp('bar')->__toString();
-    $matcher = array('tag' => 'span', 'attributes' => array( 'class' => 'alert-box radius warning' ), 'content' => 'Bar');
-    $this->assertHTML($matcher, $input);
-
-  }
-
-
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->former->framework('ZurbFoundation4');
+		$this->former->horizontal_open()->__toString();
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function matchLabel($name = 'foo', $field = 'foo', $required = false)
+	{
+		return array(
+			'tag'        => 'label',
+			'content'    => ucfirst($name),
+			'attributes' => array(
+				'for' => $field,
+			),
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanUseMagicMethods()
+	{
+		$input   = $this->former->large_submit('Save')->__toString();
+		$matcher = $this->matchInputButton('large button', 'Save');
+
+		$this->assertHTML($matcher, $input);
+	}
+
+	public function testCanSetAnErrorStateOnAField()
+	{
+		$input   = $this->former->text('foo')->state('error')->__toString();
+		$matcher = array('tag' => 'div', 'attributes' => array('class' => 'error'));
+
+		$this->assertLabel($input);
+		$this->assertHTML($this->matchField(), $input);
+		$this->assertHTML($matcher, $input);
+	}
+
+	public function testCanAppendHelpTexts()
+	{
+		$input   = $this->former->text('foo')->inlineHelp('bar')->__toString();
+		$matcher = array('tag' => 'span', 'content' => 'Bar');
+
+		$this->assertLabel($input);
+		$this->assertHTML($this->matchField(), $input);
+		$this->assertHTML($matcher, $input);
+	}
+
+	public function testCantUseBootstrapReservedMethods()
+	{
+		$this->setExpectedException('BadMethodCallException');
+
+		$this->former->text('foo')->blockHelp('bar')->__toString();
+	}
+
+	public function testCreateIconWithFrameworkSpecificIcon()
+	{
+		$icon  = $this->app['former.framework']->createIcon('smiley')->__toString();
+		$match = '<i class="general foundicon-smiley"></i>';
+
+		$this->assertEquals($match, $icon);
+	}
+
+	public function testCanAppendIcon()
+	{
+		$this->former->vertical_open();
+		$input = $this->former->text('foo')->appendIcon('ok')->__toString();
+		$match = '<div>'.
+			'<label for="foo">Foo</label>'.
+			'<div class="large-10 small-9 columns">'.
+			'<input id="foo" type="text" name="foo">'.
+			'</div>'.
+			'<div class="large-2 small-3 columns">'.
+			'<span class="postfix">'.
+			'<i class="general foundicon-ok"></i>'.
+			'</span>'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($match, $input);
+	}
+
+	public function testCreateOverideIconSettingsWithFrameworkSpecificIcon()
+	{
+		$icon  = $this->app['former.framework']->createIcon('smiley')->__toString();
+		$match = '<i class="general foundicon-smiley"></i>';
+
+		$this->assertEquals($match, $icon);
+	}
+
+	public function testVerticalFormInputField()
+	{
+		$this->former->vertical_open();
+		$field = $this->former->text('foo')->__toString();
+
+		$match = '<div>'.
+			'<label for="foo">Foo</label>'.
+			'<input id="foo" type="text" name="foo">'.
+			'</div>';
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testHorizontalFormInputField()
+	{
+		$field = $this->former->text('foo')->__toString();
+
+		$match = '<div class="row">'.
+			'<div class="small-3 columns">'.
+			'<label for="foo" class="right inline">Foo</label>'.
+			'</div>'.
+			'<div class="small-9 columns">'.
+			'<input id="foo" type="text" name="foo">'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testHelpTextHasCorrectClasses()
+	{
+
+		$input   = $this->former->text('foo')->inlineHelp('bar')->__toString();
+		$matcher = array('tag' => 'span', 'attributes' => array('class' => 'alert-box radius warning'), 'content' => 'Bar');
+		$this->assertHTML($matcher, $input);
+	}
 }
diff --git a/tests/Framework/ZurbFrameworkTest.php b/tests/Framework/ZurbFrameworkTest.php
index ff77a0dc..1b6a08aa 100644
--- a/tests/Framework/ZurbFrameworkTest.php
+++ b/tests/Framework/ZurbFrameworkTest.php
@@ -6,104 +6,101 @@
 class ZurbFrameworkTest extends FormerTests
 {
 
-  public function setUp()
-  {
-    parent::setUp();
-
-    $this->former->framework('ZurbFoundation');
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function matchLabel($name = 'foo', $field = 'foo', $required = false)
-  {
-    return array(
-      'tag' => 'label',
-      'content' => ucfirst($name),
-      'attributes' => array(
-        'for'   => $field,
-      ),
-    );
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanUseMagicMethods()
-  {
-    $input = $this->former->three_text('foo')->__toString();
-
-    $this->assertLabel($input);
-    $this->assertHTML($this->matchField(), $input);
-  }
-
-  public function testCanSetAnErrorStateOnAField()
-  {
-    $input = $this->former->text('foo')->state('error')->__toString();
-    $matcher = array('tag' => 'div', 'attributes' => array('class' => 'error'));
-
-    $this->assertLabel($input);
-    $this->assertHTML($this->matchField(), $input);
-    $this->assertHTML($matcher, $input);
-  }
-
-  public function testCanAppendHelpTexts()
-  {
-    $input = $this->former->text('foo')->inlineHelp('bar')->__toString();
-    $matcher = array('tag' => 'span', 'content' => 'Bar');
-
-    $this->assertLabel($input);
-    $this->assertHTML($this->matchField(), $input);
-    $this->assertHTML($matcher, $input);
-  }
-
-  public function testCantUseBootstrapReservedMethods()
-  {
-    $this->setExpectedException('BadMethodCallException');
-
-    $this->former->text('foo')->blockHelp('bar')->__toString();
-  }
-
-  public function testVerticalFormInputField()
-  {
-    $this->former->vertical_open();
-    $field = $this->former->text('foo')->__toString();
-
-    $match = '<div>'.
-               '<label for="foo">Foo</label>'.
-               '<input id="foo" type="text" name="foo">'.
-             '</div>';
-
-    $this->assertEquals($match, $field);
-  }
-
-  public function testHorizontalFormInputField()
-  {
-    $field = $this->former->text('foo')->__toString();
-
-    $match = '<div class="row">'.
-               '<div class="two mobile-four columns">'.
-                 '<label for="foo" class="right inline">Foo</label>'.
-               '</div>'.
-               '<div class="ten mobile-eight columns">'.
-                 '<input id="foo" type="text" name="foo">'.
-               '</div>'.
-             '</div>';
-
-    $this->assertEquals($match, $field);
-  }
-
-  public function testHelpTextHasCorrectClasses()
-  {
-
-    $input = $this->former->text('foo')->inlineHelp('bar')->__toString();
-    $matcher = array('tag' => 'span', 'attributes' => array( 'class' => 'alert-box alert error' ), 'content' => 'Bar');
-    $this->assertHTML($matcher, $input);
-
-  }
-
-
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->former->framework('ZurbFoundation');
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function matchLabel($name = 'foo', $field = 'foo', $required = false)
+	{
+		return array(
+			'tag'        => 'label',
+			'content'    => ucfirst($name),
+			'attributes' => array(
+				'for' => $field,
+			),
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanUseMagicMethods()
+	{
+		$input = $this->former->three_text('foo')->__toString();
+
+		$this->assertLabel($input);
+		$this->assertHTML($this->matchField(), $input);
+	}
+
+	public function testCanSetAnErrorStateOnAField()
+	{
+		$input   = $this->former->text('foo')->state('error')->__toString();
+		$matcher = array('tag' => 'div', 'attributes' => array('class' => 'error'));
+
+		$this->assertLabel($input);
+		$this->assertHTML($this->matchField(), $input);
+		$this->assertHTML($matcher, $input);
+	}
+
+	public function testCanAppendHelpTexts()
+	{
+		$input   = $this->former->text('foo')->inlineHelp('bar')->__toString();
+		$matcher = array('tag' => 'span', 'content' => 'Bar');
+
+		$this->assertLabel($input);
+		$this->assertHTML($this->matchField(), $input);
+		$this->assertHTML($matcher, $input);
+	}
+
+	public function testCantUseBootstrapReservedMethods()
+	{
+		$this->setExpectedException('BadMethodCallException');
+
+		$this->former->text('foo')->blockHelp('bar')->__toString();
+	}
+
+	public function testVerticalFormInputField()
+	{
+		$this->former->vertical_open();
+		$field = $this->former->text('foo')->__toString();
+
+		$match = '<div>'.
+			'<label for="foo">Foo</label>'.
+			'<input id="foo" type="text" name="foo">'.
+			'</div>';
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testHorizontalFormInputField()
+	{
+		$field = $this->former->text('foo')->__toString();
+
+		$match = '<div class="row">'.
+			'<div class="two mobile-four columns">'.
+			'<label for="foo" class="right inline">Foo</label>'.
+			'</div>'.
+			'<div class="ten mobile-eight columns">'.
+			'<input id="foo" type="text" name="foo">'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($match, $field);
+	}
+
+	public function testHelpTextHasCorrectClasses()
+	{
+
+		$input   = $this->former->text('foo')->inlineHelp('bar')->__toString();
+		$matcher = array('tag' => 'span', 'attributes' => array('class' => 'alert-box alert error'), 'content' => 'Bar');
+		$this->assertHTML($matcher, $input);
+	}
 }
diff --git a/tests/GroupTest.php b/tests/GroupTest.php
index b938836c..eb40dc28 100644
--- a/tests/GroupTest.php
+++ b/tests/GroupTest.php
@@ -1,344 +1,360 @@
 <?php
 namespace Former;
 
-use Former\TestCases\FormerTests;
 use Former\Dummy\DummyButton;
+use Former\TestCases\FormerTests;
 use Illuminate\Support\Str;
 
 class GroupTest extends FormerTests
 {
-  public function createButton($text)
-  {
-    return new DummyButton($text);
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// DATA PROVIDERS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function provideStates()
-  {
-    return array(
-      array('error'),
-      array('info'),
-      array('success'),
-      array('warning'),
-      array('foo'),
-    );
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// MATCHERS ////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function createMatcher($state = null, $inlineHelp = null, $blockHelp = null)
-  {
-    $state = ($state and $state != 'foo') ? ' ' .$state : null;
-    if($inlineHelp) $inlineHelp = '<span class="help-inline">' .ucfirst($inlineHelp). '</span>';
-    if($blockHelp)  $blockHelp  = '<p class="help-block">' .ucfirst($blockHelp). '</p>';
-
-    return
-    '<div class="control-group' .$state. '">' .
-      '<label for="foo" class="control-label">Foo</label>' .
-      '<div class="controls">' .
-        '<input id="foo" type="text" name="foo">' .
-        $inlineHelp .
-        $blockHelp .
-      '</div>' .
-    '</div>';
-  }
-
-  public function createPrependAppendMatcher($prepend = array(), $append = array())
-  {
-    foreach($prepend as $k => $p) if(!Str::startsWith($p, '<button')) $prepend[$k] = '<span class="add-on">' .$p. '</span>';
-    foreach($append as $k => $a)  if(!Str::startsWith($a, '<button'))  $append[$k] = '<span class="add-on">' .$a. '</span>';
-
-    $class = array();
-    if($prepend) $class[] = "input-prepend";
-    if($append) $class[] = "input-append";
-
-    return
-    '<div class="control-group">' .
-      '<label for="foo" class="control-label">Foo</label>' .
-      '<div class="controls">' .
-        '<div class="' .implode(' ',$class). '">'.
-          join(null, $prepend).
-          '<input id="foo" type="text" name="foo">' .
-          join(null, $append).
-          '</div>'.
-      '</div>' .
-    '</div>';
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testOpen()
-  {
-    $control = $this->former->text('foo')->__toString();
-    $matcher = $this->createMatcher();
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testCanOpenGroupManually()
-  {
-    $group   = $this->former->group('foo')->__toString();
-    $matcher = '<div class="control-group"><label for="Foo" class="control-label">Foo</label>';
-
-    $this->assertEquals($matcher, $group);
-  }
-
-  /**
-   * @dataProvider provideStates
-   */
-  public function testChangeState($state)
-  {
-    $control = $this->former->text('foo')->state($state)->__toString();
-    $matcher = $this->createMatcher($state);
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testHelp()
-  {
-    $control = $this->former->text('foo')->help('foo')->__toString();
-    $matcher = $this->createMatcher(null, 'foo');
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testInlineHelp()
-  {
-    $control = $this->former->text('foo')->inlineHelp('foo')->__toString();
-    $matcher = $this->createMatcher(null, 'foo');
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testEmptyInlineHelp()
-  {
-    $control = $this->former->text('foo')->inlineHelp(null)->__toString();
-    $matcher = $this->createMatcher();
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testBlockHelp()
-  {
-    $control = $this->former->text('foo')->blockHelp('foo')->__toString();
-    $matcher = $this->createMatcher(null, null, 'foo');
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testEmptyBlockHelp()
-  {
-    $control = $this->former->text('foo')->blockHelp(null)->__toString();
-    $matcher = $this->createMatcher();
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testBothHelps()
-  {
-    $control = $this->former->text('foo')->inlineHelp('foo')->blockHelp('foo')->__toString();
-    $matcher = $this->createMatcher(null, 'foo', 'foo');
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testPrepend()
-  {
-    $control = $this->former->text('foo')->prepend('@')->__toString();
-    $matcher = $this->createPrependAppendMatcher(array('@'));
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testPrependMultiple()
-  {
-    $control = $this->former->text('foo')->prepend('@', '$')->__toString();
-    $matcher = $this->createPrependAppendMatcher(array('@', '$'));
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testAppend()
-  {
-    $control = $this->former->text('foo')->append('@')->__toString();
-    $matcher = $this->createPrependAppendMatcher(array(), array('@'));
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testPrependAppend()
-  {
-    $control = $this->former->text('foo')->prepend('@')->append('@')->__toString();
-    $matcher = $this->createPrependAppendMatcher(array('@'), array('@'));
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testPrependAppendMix()
-  {
-    $control = $this->former->text('foo')
-      ->prepend('@', $this->createButton('foo'))
-      ->append('@', $this->createButton('foo'))
-      ->__toString();
-    $matcher = $this->createPrependAppendMatcher(
-      array('@', '<button type="button" class="btn">foo</button>'),
-      array('@', '<button type="button" class="btn">foo</button>'));
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testPrependButton()
-  {
-    $matcher = $this->createPrependAppendMatcher(array('<button type="button" class="btn">Submit</button>'));
-    $control1 = $this->former->text('foo')->prepend($this->createButton('Submit'))->__toString();
-    $this->assertEquals($matcher, $control1);
-
-    $this->resetLabels();
-    $control2 = $this->former->text('foo')->prepend('<button type="button" class="btn">Submit</button>')->__toString();
-    $this->assertEquals($matcher, $control2);
-  }
-
-  public function testPrependRawIcon()
-  {
-    $control = $this->former->text('foo')->prepend('<i class="icon-enveloppe"></i>')->__toString();
-    $matcher = $this->createPrependAppendMatcher(array('<i class="icon-enveloppe"></i>'));
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testPrependIcon()
-  {
-    $control = $this->former->text('foo')->prependIcon('enveloppe')->__toString();
-    $matcher = $this->createPrependAppendMatcher(array('<i class="icon-enveloppe"></i>'));
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testAllTheThings()
-  {
-    $control = $this->former->text('foo')
-      ->state('error')
-      ->inlineHelp('foo')
-      ->blockHelp('bar')
-      ->prepend('@', '$', $this->createButton('foo'))
-      ->append('@', '$', $this->createButton('foo'))
-      ->__toString();
-    $matcher =
-    '<div class="control-group error">'.
-      '<label for="foo" class="control-label">Foo</label>'.
-      '<div class="controls">'.
-        '<div class="input-prepend input-append">'.
-            '<span class="add-on">@</span>'.
-            '<span class="add-on">$</span>'.
-            '<button type="button" class="btn">foo</button>'.
-            '<input id="foo" type="text" name="foo">'.
-            '<span class="add-on">@</span>'.
-            '<span class="add-on">$</span>'.
-            '<button type="button" class="btn">foo</button>'.
-          '</div>'.
-        '<span class="help-inline">Foo</span>'.
-        '<p class="help-block">Bar</p>'.
-      '</div>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testCanInlineASingleField()
-  {
-    $input = $this->former->text('foo')->raw()->__toString();
-    $matcher = $this->matchField();
-    unset($matcher['id']);
-
-    $this->assertHTML($matcher, $input);
-  }
-
-  public function testCanCreateRawGroups()
-  {
-    $group = $this->former->group()->contents('This be <b>HTML</b> content');
-    $matcher = '<div class="control-group"><div class="controls">This be <b>HTML</b> content</div></div>';
-
-    $this->assertEquals($matcher, $group);
-  }
-
-  public function testCanCreateRawLabelessGroups()
-  {
-    $group = $this->former->group('MyField')->contents('This be <b>HTML</b> content');
-    $matcher = '<div class="control-group">'.
-      '<label for="MyField" class="control-label">MyField</label>'.
-      '<div class="controls">This be <b>HTML</b> content</div>'.
-    '</div>';
-
-    $this->assertEquals($matcher, $group);
-  }
-
-  public function testCanAddClassToGroup()
-  {
-    $control = $this->former->text('foo')->addGroupClass('foo')->__toString();
-    $matcher = $this->createMatcher();
-    $matcher = str_replace('group"', 'group foo"', $matcher);
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testCanRecognizeGroupValidationErrors()
-  {
-    $this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));
-    $this->former->withErrors();
-
-    $matcher = '<div class="control-group error"><label for="Foo" class="control-label">Foo</label>';
-
-    $group = $this->former->group('foo', array('foo'))->__toString();
-    $this->assertEquals($matcher, $group);
-
-    $group = $this->former->group('foo', 'foo')->__toString();
-    $this->assertEquals($matcher, $group);
-
-    $group = $this->former->group('foo', array('foo', 'bar'))->__toString();
-    $this->assertEquals($matcher, $group);
-  }
-
-  public function testUnderscoresInHelpTextAreKept()
-  {
-    $control = $this->former->text('foo')->help('/path_to_foo.jpg')->__toString();
-    $matcher = $this->createMatcher(null, '/path_to_foo.jpg');
-
-    $this->assertEquals($matcher, $control);
-  }
-
-  public function testCanIgnoreGroupValidationErrors()
-  {
-    $this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));
-    $this->former->withErrors();
-
-    $matcher = '<div class="control-group"><label for="Foo" class="control-label">Foo</label>';
-
-    $group = $this->former->group('foo', array())->__toString();
-    $this->assertEquals($matcher, $group);
-
-    $group = $this->former->group('foo', array('baz'))->__toString();
-    $this->assertEquals($matcher, $group);
-  }
-
-  public function testFieldsInCustomGroupsAreRawByDefault()
-  {
-    $this->former->group('foobar');
-      $test = $this->former->text('foobar')->__toString();
-
-    $this->assertNotContains('control-group', $test);
-  }
-
-  public function testCanSetAttributesOnGroup()
-  {
-    $text = $this->former->text('foobar')->onGroupAddClass('foobar')->__toString();
-
-    $this->assertContains('control-group foobar', $text);
-  }
+	public function createButton($text)
+	{
+		return new DummyButton($text);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// DATA PROVIDERS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function provideStates()
+	{
+		return array(
+			array('error'),
+			array('info'),
+			array('success'),
+			array('warning'),
+			array('foo'),
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// MATCHERS ////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function createMatcher($state = null, $inlineHelp = null, $blockHelp = null)
+	{
+		$state = ($state and $state != 'foo') ? ' '.$state : null;
+		if ($inlineHelp) {
+			$inlineHelp = '<span class="help-inline">'.ucfirst($inlineHelp).'</span>';
+		}
+		if ($blockHelp) {
+			$blockHelp = '<p class="help-block">'.ucfirst($blockHelp).'</p>';
+		}
+
+		return
+			'<div class="control-group'.$state.'">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<div class="controls">'.
+			'<input id="foo" type="text" name="foo">'.
+			$inlineHelp.
+			$blockHelp.
+			'</div>'.
+			'</div>';
+	}
+
+	public function createPrependAppendMatcher($prepend = array(), $append = array())
+	{
+		foreach ($prepend as $k => $p) {
+			if (!Str::startsWith($p, '<button')) {
+				$prepend[$k] = '<span class="add-on">'.$p.'</span>';
+			}
+		}
+		foreach ($append as $k => $a) {
+			if (!Str::startsWith($a, '<button')) {
+				$append[$k] = '<span class="add-on">'.$a.'</span>';
+			}
+		}
+
+		$class = array();
+		if ($prepend) {
+			$class[] = "input-prepend";
+		}
+		if ($append) {
+			$class[] = "input-append";
+		}
+
+		return
+			'<div class="control-group">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<div class="controls">'.
+			'<div class="'.implode(' ', $class).'">'.
+			join(null, $prepend).
+			'<input id="foo" type="text" name="foo">'.
+			join(null, $append).
+			'</div>'.
+			'</div>'.
+			'</div>';
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testOpen()
+	{
+		$control = $this->former->text('foo')->__toString();
+		$matcher = $this->createMatcher();
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testCanOpenGroupManually()
+	{
+		$group   = $this->former->group('foo')->__toString();
+		$matcher = '<div class="control-group"><label for="Foo" class="control-label">Foo</label>';
+
+		$this->assertEquals($matcher, $group);
+	}
+
+	/**
+	 * @dataProvider provideStates
+	 */
+	public function testChangeState($state)
+	{
+		$control = $this->former->text('foo')->state($state)->__toString();
+		$matcher = $this->createMatcher($state);
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testHelp()
+	{
+		$control = $this->former->text('foo')->help('foo')->__toString();
+		$matcher = $this->createMatcher(null, 'foo');
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testInlineHelp()
+	{
+		$control = $this->former->text('foo')->inlineHelp('foo')->__toString();
+		$matcher = $this->createMatcher(null, 'foo');
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testEmptyInlineHelp()
+	{
+		$control = $this->former->text('foo')->inlineHelp(null)->__toString();
+		$matcher = $this->createMatcher();
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testBlockHelp()
+	{
+		$control = $this->former->text('foo')->blockHelp('foo')->__toString();
+		$matcher = $this->createMatcher(null, null, 'foo');
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testEmptyBlockHelp()
+	{
+		$control = $this->former->text('foo')->blockHelp(null)->__toString();
+		$matcher = $this->createMatcher();
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testBothHelps()
+	{
+		$control = $this->former->text('foo')->inlineHelp('foo')->blockHelp('foo')->__toString();
+		$matcher = $this->createMatcher(null, 'foo', 'foo');
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testPrepend()
+	{
+		$control = $this->former->text('foo')->prepend('@')->__toString();
+		$matcher = $this->createPrependAppendMatcher(array('@'));
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testPrependMultiple()
+	{
+		$control = $this->former->text('foo')->prepend('@', '$')->__toString();
+		$matcher = $this->createPrependAppendMatcher(array('@', '$'));
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testAppend()
+	{
+		$control = $this->former->text('foo')->append('@')->__toString();
+		$matcher = $this->createPrependAppendMatcher(array(), array('@'));
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testPrependAppend()
+	{
+		$control = $this->former->text('foo')->prepend('@')->append('@')->__toString();
+		$matcher = $this->createPrependAppendMatcher(array('@'), array('@'));
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testPrependAppendMix()
+	{
+		$control = $this->former->text('foo')
+		                        ->prepend('@', $this->createButton('foo'))
+		                        ->append('@', $this->createButton('foo'))
+		                        ->__toString();
+		$matcher = $this->createPrependAppendMatcher(
+			array('@', '<button type="button" class="btn">foo</button>'),
+			array('@', '<button type="button" class="btn">foo</button>'));
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testPrependButton()
+	{
+		$matcher  = $this->createPrependAppendMatcher(array('<button type="button" class="btn">Submit</button>'));
+		$control1 = $this->former->text('foo')->prepend($this->createButton('Submit'))->__toString();
+		$this->assertEquals($matcher, $control1);
+
+		$this->resetLabels();
+		$control2 = $this->former->text('foo')->prepend('<button type="button" class="btn">Submit</button>')->__toString();
+		$this->assertEquals($matcher, $control2);
+	}
+
+	public function testPrependRawIcon()
+	{
+		$control = $this->former->text('foo')->prepend('<i class="icon-enveloppe"></i>')->__toString();
+		$matcher = $this->createPrependAppendMatcher(array('<i class="icon-enveloppe"></i>'));
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testPrependIcon()
+	{
+		$control = $this->former->text('foo')->prependIcon('enveloppe')->__toString();
+		$matcher = $this->createPrependAppendMatcher(array('<i class="icon-enveloppe"></i>'));
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testAllTheThings()
+	{
+		$control = $this->former->text('foo')
+		                        ->state('error')
+		                        ->inlineHelp('foo')
+		                        ->blockHelp('bar')
+		                        ->prepend('@', '$', $this->createButton('foo'))
+		                        ->append('@', '$', $this->createButton('foo'))
+		                        ->__toString();
+		$matcher =
+			'<div class="control-group error">'.
+			'<label for="foo" class="control-label">Foo</label>'.
+			'<div class="controls">'.
+			'<div class="input-prepend input-append">'.
+			'<span class="add-on">@</span>'.
+			'<span class="add-on">$</span>'.
+			'<button type="button" class="btn">foo</button>'.
+			'<input id="foo" type="text" name="foo">'.
+			'<span class="add-on">@</span>'.
+			'<span class="add-on">$</span>'.
+			'<button type="button" class="btn">foo</button>'.
+			'</div>'.
+			'<span class="help-inline">Foo</span>'.
+			'<p class="help-block">Bar</p>'.
+			'</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testCanInlineASingleField()
+	{
+		$input   = $this->former->text('foo')->raw()->__toString();
+		$matcher = $this->matchField();
+		unset($matcher['id']);
+
+		$this->assertHTML($matcher, $input);
+	}
+
+	public function testCanCreateRawGroups()
+	{
+		$group   = $this->former->group()->contents('This be <b>HTML</b> content');
+		$matcher = '<div class="control-group"><div class="controls">This be <b>HTML</b> content</div></div>';
+
+		$this->assertEquals($matcher, $group);
+	}
+
+	public function testCanCreateRawLabelessGroups()
+	{
+		$group   = $this->former->group('MyField')->contents('This be <b>HTML</b> content');
+		$matcher = '<div class="control-group">'.
+			'<label for="MyField" class="control-label">MyField</label>'.
+			'<div class="controls">This be <b>HTML</b> content</div>'.
+			'</div>';
+
+		$this->assertEquals($matcher, $group);
+	}
+
+	public function testCanAddClassToGroup()
+	{
+		$control = $this->former->text('foo')->addGroupClass('foo')->__toString();
+		$matcher = $this->createMatcher();
+		$matcher = str_replace('group"', 'group foo"', $matcher);
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testCanRecognizeGroupValidationErrors()
+	{
+		$this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));
+		$this->former->withErrors();
+
+		$matcher = '<div class="control-group error"><label for="Foo" class="control-label">Foo</label>';
+
+		$group = $this->former->group('foo', array('foo'))->__toString();
+		$this->assertEquals($matcher, $group);
+
+		$group = $this->former->group('foo', 'foo')->__toString();
+		$this->assertEquals($matcher, $group);
+
+		$group = $this->former->group('foo', array('foo', 'bar'))->__toString();
+		$this->assertEquals($matcher, $group);
+	}
+
+	public function testUnderscoresInHelpTextAreKept()
+	{
+		$control = $this->former->text('foo')->help('/path_to_foo.jpg')->__toString();
+		$matcher = $this->createMatcher(null, '/path_to_foo.jpg');
+
+		$this->assertEquals($matcher, $control);
+	}
+
+	public function testCanIgnoreGroupValidationErrors()
+	{
+		$this->mockSession(array('foo' => 'bar', 'bar' => 'baz'));
+		$this->former->withErrors();
+
+		$matcher = '<div class="control-group"><label for="Foo" class="control-label">Foo</label>';
+
+		$group = $this->former->group('foo', array())->__toString();
+		$this->assertEquals($matcher, $group);
+
+		$group = $this->former->group('foo', array('baz'))->__toString();
+		$this->assertEquals($matcher, $group);
+	}
+
+	public function testFieldsInCustomGroupsAreRawByDefault()
+	{
+		$this->former->group('foobar');
+		$test = $this->former->text('foobar')->__toString();
+
+		$this->assertNotContains('control-group', $test);
+	}
+
+	public function testCanSetAttributesOnGroup()
+	{
+		$text = $this->former->text('foobar')->onGroupAddClass('foobar')->__toString();
+
+		$this->assertContains('control-group foobar', $text);
+	}
 }
diff --git a/tests/HelpersTest.php b/tests/HelpersTest.php
index a83953ff..46aaa60c 100644
--- a/tests/HelpersTest.php
+++ b/tests/HelpersTest.php
@@ -6,43 +6,43 @@
 
 class HelpersTest extends FormerTests
 {
-  public function testDoesntUseTranslationsArraysAsLabels()
-  {
-    $former  = $this->former->text('pagination')->__toString();
-    $matcher = $this->matchField(array(), 'text', 'pagination');
-
-    $this->assertHTML($matcher, $former);
-  }
-
-  public function testTranslateFieldNameUnderScoreToSpace()
-  {
-    $input   = $this->former->text('field_name_with_underscore')->__toString();
-    $matcher = $this->matchLabel('Field name with underscore', 'field_name_with_underscore');
-
-    $this->assertHTML($matcher, $input);
-  }
-
-  public function testCanDisableTranslationCapitalization()
-  {
-    $this->app['config'] = Mockery::mock('Config')
-      ->shouldReceive('get')->with('former::live_validation', '')->andReturn(true)
-      ->shouldReceive('get')->with('former::translate_from', '')->andReturn(true)
-      ->shouldReceive('get')->with('former::automatic_label', '')->andReturn(true)
-      ->shouldReceive('get')->with('former::capitalize_translations', '')->andReturn(false)
-      ->mock();
-    Helpers::setApp($this->app);
-
-    $this->assertEquals('field', Helpers::translate('field'));
-  }
-
-  public function testNestedTranslationFieldNames()
-  {
-    $matcher = $this->matchLabel('City', 'address.city');
-    $input = $this->former->text('address.city')->__toString();
-    $this->assertHTML($matcher, $input);
-
-    $matcher = $this->matchLabel('City', 'address[city]');
-    $input = $this->former->text('address[city]')->__toString();
-    $this->assertHTML($matcher, $input);
-  }
+	public function testDoesntUseTranslationsArraysAsLabels()
+	{
+		$former  = $this->former->text('pagination')->__toString();
+		$matcher = $this->matchField(array(), 'text', 'pagination');
+
+		$this->assertHTML($matcher, $former);
+	}
+
+	public function testTranslateFieldNameUnderScoreToSpace()
+	{
+		$input   = $this->former->text('field_name_with_underscore')->__toString();
+		$matcher = $this->matchLabel('Field name with underscore', 'field_name_with_underscore');
+
+		$this->assertHTML($matcher, $input);
+	}
+
+	public function testCanDisableTranslationCapitalization()
+	{
+		$this->app['config'] = Mockery::mock('Config')
+		                              ->shouldReceive('get')->with('former::live_validation', '')->andReturn(true)
+		                              ->shouldReceive('get')->with('former::translate_from', '')->andReturn(true)
+		                              ->shouldReceive('get')->with('former::automatic_label', '')->andReturn(true)
+		                              ->shouldReceive('get')->with('former::capitalize_translations', '')->andReturn(false)
+		                              ->mock();
+		Helpers::setApp($this->app);
+
+		$this->assertEquals('field', Helpers::translate('field'));
+	}
+
+	public function testNestedTranslationFieldNames()
+	{
+		$matcher = $this->matchLabel('City', 'address.city');
+		$input   = $this->former->text('address.city')->__toString();
+		$this->assertHTML($matcher, $input);
+
+		$matcher = $this->matchLabel('City', 'address[city]');
+		$input   = $this->former->text('address[city]')->__toString();
+		$this->assertHTML($matcher, $input);
+	}
 }
diff --git a/tests/LiveValidationTest.php b/tests/LiveValidationTest.php
index 08b77fc2..b6cd8442 100644
--- a/tests/LiveValidationTest.php
+++ b/tests/LiveValidationTest.php
@@ -6,502 +6,506 @@
 class LiveValidationTest extends FormerTests
 {
 
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// DATA PROVIDERS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function providePatterns()
-  {
-    foreach(array(
-      'alpha'          => '[a-zA-Z]+',
-      'alpha_dash'     => '[a-zA-Z0-9_\-]+',
-      'alpha_num'      => '[a-zA-Z0-9]+',
-      'in:foo'         => '^foo$',
-      'in:foo,bar'     => '^(foo|bar)$',
-      'integer'        => '\d+',
-      'regex:/[a-z]+/' => '[a-z]+',
-      'match:/[a-z]+/' => '[a-z]+',
-      'not_in:foo,bar' => '(?:(?!^foo$|^bar$).)*',
-      'not_numeric'    => '\D+',
-      'numeric'        => '[+-]?\d*\.?\d+',
-    ) as $type => $pattern) $patterns[] = array($type, $pattern);
-
-    return $patterns;
-  }
-
-  public function provideTypes()
-  {
-    return array(
-      array('email'),
-      array('url'),
-    );
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanSkipUnexistingHtmlEquivalents()
-  {
-    $this->former->withRules(array('foo' => 'unique:users'));
-    $input = $this->former->text('foo')->render();
-
-    $this->assertHTML($this->matchField(), $input);
-  }
-
-  public function testCanHaveSpacesInRulesForSomeReason()
-  {
-    $this->former->withRules(array('foo' => 'required | email'));
-    $input = $this->former->text('foo')->render();
-
-    $this->assertHTML($this->matchField(array('required' => true), 'email'), $input);
-  }
-
-  public function testCanUseMultipleRulesArray()
-  {
-    $this->former->withRules(array('foo' => 'required'), array('bar' => 'email'));
-
-    // First field
-    $input = $this->former->text('foo')->__toString();
-
-    $this->assertLabel($input, 'foo', true);
-    $this->assertHTML($this->matchControlGroup(), $input);
-    $this->assertHTML($this->matchField(array('required' => 'true')), $input);
-
-    // Second field
-    $email = $this->former->text('bar')->__toString();
-
-    $this->assertLabel($email, 'bar');
-    $this->assertHTML($this->matchControlGroup(), $email);
-    $this->assertHTML($this->matchField(array(), 'email', 'bar'), $email);
-  }
-
-  public function testCanUseMultipleRulesArrayAsArray()
-  {
-    $this->former->withRules(array('foo' => array('required')), array('bar' => array('email')));
-
-    // First field
-    $input = $this->former->text('foo')->__toString();
-
-    $this->assertLabel($input, 'foo', true);
-    $this->assertHTML($this->matchControlGroup(), $input);
-    $this->assertHTML($this->matchField(array('required' => 'true')), $input);
-
-    // Second field
-    $email = $this->former->text('bar')->__toString();
-
-    $this->assertLabel($email, 'bar');
-    $this->assertHTML($this->matchControlGroup(), $email);
-    $this->assertHTML($this->matchField(array(), 'email', 'bar'), $email);
-  }
-
-  public function testCanSetFieldAsRequired()
-  {
-    $this->former->withRules(array('foo' => 'required'));
-    $input = $this->former->text('foo')->__toString();
-
-    $this->assertHTML($this->matchField(array('required' => 'true')), $input);
-    $this->assertLabel($input, 'foo', true);
-    $this->assertHTML($this->matchControlGroup(), $input);
-  }
-
-  public function testCanSetFieldAsRequiredAsArray()
-  {
-    $this->former->withRules(array('foo' => array('required')));
-    $input = $this->former->text('foo')->__toString();
-
-    $this->assertHTML($this->matchField(array('required' => 'true')), $input);
-    $this->assertLabel($input, 'foo', true);
-    $this->assertHTML($this->matchControlGroup(), $input);
-  }
-
-  public function testCanAddRequiredTextToPlainFields()
-  {
-    $this->former->close();
-    $this->former->withRules(array('foo' => 'required'));
-
-    $input = $this->former->text('foo')->__toString();
-    $label = $this->matchLabel('Foo', 'foo', true);
-    unset($label['attributes']['class']);
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// DATA PROVIDERS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function providePatterns()
+	{
+		foreach (
+			array(
+				'alpha'          => '[a-zA-Z]+',
+				'alpha_dash'     => '[a-zA-Z0-9_\-]+',
+				'alpha_num'      => '[a-zA-Z0-9]+',
+				'in:foo'         => '^foo$',
+				'in:foo,bar'     => '^(foo|bar)$',
+				'integer'        => '\d+',
+				'regex:/[a-z]+/' => '[a-z]+',
+				'match:/[a-z]+/' => '[a-z]+',
+				'not_in:foo,bar' => '(?:(?!^foo$|^bar$).)*',
+				'not_numeric'    => '\D+',
+				'numeric'        => '[+-]?\d*\.?\d+',
+			) as $type => $pattern
+		) {
+			$patterns[] = array($type, $pattern);
+		}
+
+		return $patterns;
+	}
+
+	public function provideTypes()
+	{
+		return array(
+			array('email'),
+			array('url'),
+		);
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanSkipUnexistingHtmlEquivalents()
+	{
+		$this->former->withRules(array('foo' => 'unique:users'));
+		$input = $this->former->text('foo')->render();
+
+		$this->assertHTML($this->matchField(), $input);
+	}
+
+	public function testCanHaveSpacesInRulesForSomeReason()
+	{
+		$this->former->withRules(array('foo' => 'required | email'));
+		$input = $this->former->text('foo')->render();
+
+		$this->assertHTML($this->matchField(array('required' => true), 'email'), $input);
+	}
+
+	public function testCanUseMultipleRulesArray()
+	{
+		$this->former->withRules(array('foo' => 'required'), array('bar' => 'email'));
+
+		// First field
+		$input = $this->former->text('foo')->__toString();
+
+		$this->assertLabel($input, 'foo', true);
+		$this->assertHTML($this->matchControlGroup(), $input);
+		$this->assertHTML($this->matchField(array('required' => 'true')), $input);
+
+		// Second field
+		$email = $this->former->text('bar')->__toString();
+
+		$this->assertLabel($email, 'bar');
+		$this->assertHTML($this->matchControlGroup(), $email);
+		$this->assertHTML($this->matchField(array(), 'email', 'bar'), $email);
+	}
+
+	public function testCanUseMultipleRulesArrayAsArray()
+	{
+		$this->former->withRules(array('foo' => array('required')), array('bar' => array('email')));
+
+		// First field
+		$input = $this->former->text('foo')->__toString();
+
+		$this->assertLabel($input, 'foo', true);
+		$this->assertHTML($this->matchControlGroup(), $input);
+		$this->assertHTML($this->matchField(array('required' => 'true')), $input);
+
+		// Second field
+		$email = $this->former->text('bar')->__toString();
+
+		$this->assertLabel($email, 'bar');
+		$this->assertHTML($this->matchControlGroup(), $email);
+		$this->assertHTML($this->matchField(array(), 'email', 'bar'), $email);
+	}
+
+	public function testCanSetFieldAsRequired()
+	{
+		$this->former->withRules(array('foo' => 'required'));
+		$input = $this->former->text('foo')->__toString();
+
+		$this->assertHTML($this->matchField(array('required' => 'true')), $input);
+		$this->assertLabel($input, 'foo', true);
+		$this->assertHTML($this->matchControlGroup(), $input);
+	}
+
+	public function testCanSetFieldAsRequiredAsArray()
+	{
+		$this->former->withRules(array('foo' => array('required')));
+		$input = $this->former->text('foo')->__toString();
+
+		$this->assertHTML($this->matchField(array('required' => 'true')), $input);
+		$this->assertLabel($input, 'foo', true);
+		$this->assertHTML($this->matchControlGroup(), $input);
+	}
+
+	public function testCanAddRequiredTextToPlainFields()
+	{
+		$this->former->close();
+		$this->former->withRules(array('foo' => 'required'));
+
+		$input = $this->former->text('foo')->__toString();
+		$label = $this->matchLabel('Foo', 'foo', true);
+		unset($label['attributes']['class']);
 
-    $this->assertHTML($this->matchField(array('required' => 'true')), $input);
-    $this->assertHTML($label, $input);
-  }
+		$this->assertHTML($this->matchField(array('required' => 'true')), $input);
+		$this->assertHTML($label, $input);
+	}
 
-  public function testCanAddRequiredTextToPlainFieldsAsArray()
-  {
-    $this->former->close();
-    $this->former->withRules(array('foo' => array('required')));
+	public function testCanAddRequiredTextToPlainFieldsAsArray()
+	{
+		$this->former->close();
+		$this->former->withRules(array('foo' => array('required')));
 
-    $input = $this->former->text('foo')->__toString();
-    $label = $this->matchLabel('Foo', 'foo', true);
-    unset($label['attributes']['class']);
+		$input = $this->former->text('foo')->__toString();
+		$label = $this->matchLabel('Foo', 'foo', true);
+		unset($label['attributes']['class']);
 
-    $this->assertHTML($this->matchField(array('required' => 'true')), $input);
-    $this->assertHTML($label, $input);
-  }
+		$this->assertHTML($this->matchField(array('required' => 'true')), $input);
+		$this->assertHTML($label, $input);
+	}
 
-  public function testCanSetMaxToText()
-  {
-    $this->former->withRules(array('foo' => 'max:42'));
+	public function testCanSetMaxToText()
+	{
+		$this->former->withRules(array('foo' => 'max:42'));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('maxlength' => '42'));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('maxlength' => '42'));
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanSetMaxToTextAsArray()
-  {
-    $this->former->withRules(array('foo' => array('max:42')));
+	public function testCanSetMaxToTextAsArray()
+	{
+		$this->former->withRules(array('foo' => array('max:42')));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('maxlength' => '42'));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('maxlength' => '42'));
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanSetMaxToNumber()
-  {
-    $this->former->withRules(array('foo' => 'max:42'));
+	public function testCanSetMaxToNumber()
+	{
+		$this->former->withRules(array('foo' => 'max:42'));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('max' => '42'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('max' => '42'), 'number');
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanSetMaxToNumberAsArray()
-  {
-    $this->former->withRules(array('foo' => array('max:42')));
+	public function testCanSetMaxToNumberAsArray()
+	{
+		$this->former->withRules(array('foo' => array('max:42')));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('max' => '42'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('max' => '42'), 'number');
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanSetMinToText()
-  {
-    $this->former->withRules(array('foo' => 'min:42'));
+	public function testCanSetMinToText()
+	{
+		$this->former->withRules(array('foo' => 'min:42'));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('pattern' => '.{42,}'));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('pattern' => '.{42,}'));
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanSetMinToTextAsArray()
-  {
-    $this->former->withRules(array('foo' => array('min:42')));
+	public function testCanSetMinToTextAsArray()
+	{
+		$this->former->withRules(array('foo' => array('min:42')));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('pattern' => '.{42,}'));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('pattern' => '.{42,}'));
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanSetMinToNumber()
-  {
-    $this->former->withRules(array('foo' => 'min:42'));
+	public function testCanSetMinToNumber()
+	{
+		$this->former->withRules(array('foo' => 'min:42'));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('min' => '42'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('min' => '42'), 'number');
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanSetMinToNumberAsArray()
-  {
-    $this->former->withRules(array('foo' => array('min:42')));
+	public function testCanSetMinToNumberAsArray()
+	{
+		$this->former->withRules(array('foo' => array('min:42')));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('min' => '42'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('min' => '42'), 'number');
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  /**
-   * @dataProvider providePatterns
-   */
-  public function testCanApplyPatternsToFields($type, $pattern)
-  {
-    $this->former->withRules(array('foo' => $type));
+	/**
+	 * @dataProvider providePatterns
+	 */
+	public function testCanApplyPatternsToFields($type, $pattern)
+	{
+		$this->former->withRules(array('foo' => $type));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('pattern' => $pattern));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('pattern' => $pattern));
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  /**
-   * @dataProvider providePatterns
-   */
-  public function testCanApplyPatternsToFieldsAsArray($type, $pattern)
-  {
-    $type = explode('|', $type);
+	/**
+	 * @dataProvider providePatterns
+	 */
+	public function testCanApplyPatternsToFieldsAsArray($type, $pattern)
+	{
+		$type = explode('|', $type);
 
-    $this->former->withRules(array('foo' => $type));
+		$this->former->withRules(array('foo' => $type));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('pattern' => $pattern));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('pattern' => $pattern));
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetNumberFieldAsNumeric()
-  {
-    $this->former->withRules(array('foo' => 'numeric'));
+	public function testCanSetNumberFieldAsNumeric()
+	{
+		$this->former->withRules(array('foo' => 'numeric'));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('step' => 'any'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('step' => 'any'), 'number');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetNumberFieldAsNumericAsArray()
-  {
-    $this->former->withRules(array('foo' => array('numeric')));
+	public function testCanSetNumberFieldAsNumericAsArray()
+	{
+		$this->former->withRules(array('foo' => array('numeric')));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('step' => 'any'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('step' => 'any'), 'number');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetDateAsBeforeSomething()
-  {
-    $this->former->withRules(array('foo' => 'before:2012-03-03'));
+	public function testCanSetDateAsBeforeSomething()
+	{
+		$this->former->withRules(array('foo' => 'before:2012-03-03'));
 
-    $input = $this->former->date('foo')->__toString();
-    $matcher = $this->matchField(array('max' => '2012-03-03'), 'date');
+		$input   = $this->former->date('foo')->__toString();
+		$matcher = $this->matchField(array('max' => '2012-03-03'), 'date');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetDatetimeAsBeforeSomething()
-  {
-    $this->former->withRules(array('foo' => 'before:2012-03-03 10:00:00'));
+	public function testCanSetDatetimeAsBeforeSomething()
+	{
+		$this->former->withRules(array('foo' => 'before:2012-03-03 10:00:00'));
 
-    $input = $this->former->datetime('foo')->__toString();
-    $matcher = $this->matchField(array('max' => '2012-03-03T10:00:00'), 'datetime');
+		$input   = $this->former->datetime('foo')->__toString();
+		$matcher = $this->matchField(array('max' => '2012-03-03T10:00:00'), 'datetime');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetDateAsBeforeSomethingAsArray()
-  {
-    $this->former->withRules(array('foo' => array('before:2012-03-03')));
+	public function testCanSetDateAsBeforeSomethingAsArray()
+	{
+		$this->former->withRules(array('foo' => array('before:2012-03-03')));
 
-    $input = $this->former->date('foo')->__toString();
-    $matcher = $this->matchField(array('max' => '2012-03-03'), 'date');
+		$input   = $this->former->date('foo')->__toString();
+		$matcher = $this->matchField(array('max' => '2012-03-03'), 'date');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetDateAsAfterSomething()
-  {
-    $this->former->withRules(array('foo' => 'after:2012-03-03'));
+	public function testCanSetDateAsAfterSomething()
+	{
+		$this->former->withRules(array('foo' => 'after:2012-03-03'));
 
-    $input = $this->former->date('foo')->__toString();
-    $matcher = $this->matchField(array('min' => '2012-03-03'), 'date');
+		$input   = $this->former->date('foo')->__toString();
+		$matcher = $this->matchField(array('min' => '2012-03-03'), 'date');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetDateAsAfterSomethingAsArray()
-  {
-    $this->former->withRules(array('foo' => array('after:2012-03-03')));
+	public function testCanSetDateAsAfterSomethingAsArray()
+	{
+		$this->former->withRules(array('foo' => array('after:2012-03-03')));
 
-    $input = $this->former->date('foo')->__toString();
-    $matcher = $this->matchField(array('min' => '2012-03-03'), 'date');
+		$input   = $this->former->date('foo')->__toString();
+		$matcher = $this->matchField(array('min' => '2012-03-03'), 'date');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanRestrictMimeTypes()
-  {
-    $this->former->withRules(array('foo' => 'mimes:jpg,gif'));
+	public function testCanRestrictMimeTypes()
+	{
+		$this->former->withRules(array('foo' => 'mimes:jpg,gif'));
 
-    $input = $this->former->file('foo')->__toString();
-    $matcher = $this->matchField(array('accept' => 'image/jpeg,image/gif'), 'file');
+		$input   = $this->former->file('foo')->__toString();
+		$matcher = $this->matchField(array('accept' => 'image/jpeg,image/gif'), 'file');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanRestrictMimeTypesAsArray()
-  {
-    $this->former->withRules(array('foo' => array('mimes:jpg,gif')));
+	public function testCanRestrictMimeTypesAsArray()
+	{
+		$this->former->withRules(array('foo' => array('mimes:jpg,gif')));
 
-    $input = $this->former->file('foo')->__toString();
-    $matcher = $this->matchField(array('accept' => 'image/jpeg,image/gif'), 'file');
+		$input   = $this->former->file('foo')->__toString();
+		$matcher = $this->matchField(array('accept' => 'image/jpeg,image/gif'), 'file');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCantUseAcceptOnNonFilesFields()
-  {
-    $this->former->withRules(array('foo' => array('mimes:jpg,gif')));
+	public function testCantUseAcceptOnNonFilesFields()
+	{
+		$this->former->withRules(array('foo' => array('mimes:jpg,gif')));
 
-    $input = $this->former->text('foo')->render();
-    $matcher = $this->matchField();
+		$input   = $this->former->text('foo')->render();
+		$matcher = $this->matchField();
 
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanForceFieldToImage()
-  {
-    $this->former->withRules(array('foo' => 'image'));
+	public function testCanForceFieldToImage()
+	{
+		$this->former->withRules(array('foo' => 'image'));
 
-    $input = $this->former->file('foo')->__toString();
-    $matcher = $this->matchField(array('accept' => 'image/jpeg,image/png,image/gif,image/bmp'), 'file');
+		$input   = $this->former->file('foo')->__toString();
+		$matcher = $this->matchField(array('accept' => 'image/jpeg,image/png,image/gif,image/bmp'), 'file');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanForceFieldToImageAsArray()
-  {
-    $this->former->withRules(array('foo' => array('image')));
+	public function testCanForceFieldToImageAsArray()
+	{
+		$this->former->withRules(array('foo' => array('image')));
 
-    $input = $this->former->file('foo')->__toString();
-    $matcher = $this->matchField(array('accept' => 'image/jpeg,image/png,image/gif,image/bmp'), 'file');
+		$input   = $this->former->file('foo')->__toString();
+		$matcher = $this->matchField(array('accept' => 'image/jpeg,image/png,image/gif,image/bmp'), 'file');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  /**
-   * @dataProvider provideTypes
-   */
-  public function testCanSwitchTypesAccordingToRules($type)
-  {
-    $this->former->withRules(array('foo' => $type));
+	/**
+	 * @dataProvider provideTypes
+	 */
+	public function testCanSwitchTypesAccordingToRules($type)
+	{
+		$this->former->withRules(array('foo' => $type));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array(), $type);
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array(), $type);
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  /**
-   * @dataProvider provideTypes
-   */
-  public function testCanSwitchTypesAccordingToRulesAsArray($type)
-  {
-    $type = explode('|', $type);
+	/**
+	 * @dataProvider provideTypes
+	 */
+	public function testCanSwitchTypesAccordingToRulesAsArray($type)
+	{
+		$type = explode('|', $type);
 
-    $this->former->withRules(array('foo' => $type));
+		$this->former->withRules(array('foo' => $type));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array(), $type[0]);
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array(), $type[0]);
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetBoundariesToText()
-  {
-    $this->former->withRules(array('foo' => 'between:1,10'));
+	public function testCanSetBoundariesToText()
+	{
+		$this->former->withRules(array('foo' => 'between:1,10'));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('pattern' => '.{1,10}', 'maxlength' => '10'));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('pattern' => '.{1,10}', 'maxlength' => '10'));
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetBoundariesToTextAsArray()
-  {
-    $this->former->withRules(array('foo' => array('between:1,10')));
+	public function testCanSetBoundariesToTextAsArray()
+	{
+		$this->former->withRules(array('foo' => array('between:1,10')));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField(array('pattern' => '.{1,10}', 'maxlength' => '10'));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField(array('pattern' => '.{1,10}', 'maxlength' => '10'));
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetBoundariestoNumber()
-  {
-    $this->former->withRules(array('foo' => 'between:1,10'));
+	public function testCanSetBoundariestoNumber()
+	{
+		$this->former->withRules(array('foo' => 'between:1,10'));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('min' => '1', 'max' => '10'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('min' => '1', 'max' => '10'), 'number');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanSetBoundariestoNumberAsArray()
-  {
-    $this->former->withRules(array('foo' => array('between:1,10')));
+	public function testCanSetBoundariestoNumberAsArray()
+	{
+		$this->former->withRules(array('foo' => array('between:1,10')));
 
-    $input = $this->former->number('foo')->__toString();
-    $matcher = $this->matchField(array('min' => '1', 'max' => '10'), 'number');
+		$input   = $this->former->number('foo')->__toString();
+		$matcher = $this->matchField(array('min' => '1', 'max' => '10'), 'number');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanDisableLiveValidation()
-  {
-    // Change config
-    $this->mockConfig(array('live_validation' => false));
-    $this->former->withRules(array('foo' => 'required'));
+	public function testCanDisableLiveValidation()
+	{
+		// Change config
+		$this->mockConfig(array('live_validation' => false));
+		$this->former->withRules(array('foo' => 'required'));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField();
-
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
-
-  public function testCanDisableLiveValidationAsArray()
-  {
-    // Change config
-    $this->mockConfig(array('live_validation' => false));
-    $this->former->withRules(array('foo' => array('required')));
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField();
+
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
+
+	public function testCanDisableLiveValidationAsArray()
+	{
+		// Change config
+		$this->mockConfig(array('live_validation' => false));
+		$this->former->withRules(array('foo' => array('required')));
 
-    $input = $this->former->text('foo')->__toString();
-    $matcher = $this->matchField();
+		$input   = $this->former->text('foo')->__toString();
+		$matcher = $this->matchField();
 
-    $this->assertHTML($matcher, $input);
-    $this->assertControlGroup($input);
-  }
+		$this->assertHTML($matcher, $input);
+		$this->assertControlGroup($input);
+	}
 
-  public function testCanApplyRulesByChaining()
-  {
-    $input = $this->former->number('foo')->rule('max', 10)->__toString();
-    $matcher = $this->matchField(array('max' => 10), 'number');
+	public function testCanApplyRulesByChaining()
+	{
+		$input   = $this->former->number('foo')->rule('max', 10)->__toString();
+		$matcher = $this->matchField(array('max' => 10), 'number');
 
-    $this->assertControlGroup($input);
-    $this->assertHTML($matcher, $input);
-  }
+		$this->assertControlGroup($input);
+		$this->assertHTML($matcher, $input);
+	}
 
-  public function testCanCreateMaxFileSizeForFiles()
-  {
-    $input = $this->former->file('foo')->rule('max', 10)->__toString();
-    $this->assertHTML($this->matchField(array('value' => 10240), 'hidden', 'MAX_FILE_SIZE'), $input);
-  }
+	public function testCanCreateMaxFileSizeForFiles()
+	{
+		$input = $this->former->file('foo')->rule('max', 10)->__toString();
+		$this->assertHTML($this->matchField(array('value' => 10240), 'hidden', 'MAX_FILE_SIZE'), $input);
+	}
 }
diff --git a/tests/PopulatorTest.php b/tests/PopulatorTest.php
index 933125f1..20b989e1 100644
--- a/tests/PopulatorTest.php
+++ b/tests/PopulatorTest.php
@@ -1,114 +1,113 @@
 <?php
 namespace Former;
 
-use Former\TestCases\FormerTests;
 use Former\Dummy\DummyEloquent;
-use Former\Populator;
 use Former\Dummy\DummyToArray;
+use Former\TestCases\FormerTests;
 
 class PopulatorTest extends FormerTests
 {
-  public function testCanPopulateClassOnConstruct()
-  {
-    $populator = new Populator(array('foo', 'bar'));
-
-    $this->assertEquals(array('foo', 'bar'), $populator->all());
-  }
-
-  public function testCanResetValues()
-  {
-    $populator = new Populator(array('foo', 'bar'));
-    $populator->reset();
-
-    $this->assertEquals(array(), $populator->all());
-  }
-
-  public function testCanSetSingleValue()
-  {
-    $populator = new Populator(array('foo', 'bar'));
-    $populator->put(2, 'bar');
-
-    $this->assertEquals(array('foo', 'bar', 'bar'), $populator->all());
-  }
-
-  public function testCanSetValueOnModel()
-  {
-    $model = new DummyEloquent(array('id' => 1, 'name' => 'foo'));
-    $populator = new Populator($model);
-    $populator->put('foo', 'bar');
-
-    $this->assertEquals('bar', $populator->get('foo'));
-  }
-
-  public function testCanSwapOutValues()
-  {
-    $populator = new Populator(array('foo', 'bar'));
-    $populator->replace(array('bar', 'foo'));
-
-    $this->assertEquals(array('bar', 'foo'), $populator->all());
-  }
-
-  public function testCanGetAttributesAndMutators()
-  {
-    $model = new DummyEloquent(array('id' => 1, 'name' => 'foo'));
-    $populator = new Populator($model);
-
-    $this->assertEquals('custom', $populator->get('custom'));
-    $this->assertEquals('foo', $populator->get('name'));
-  }
-
-  public function testCanGetValueThroughArrayNotation()
-  {
-    $values = (object) array(
-      'foo' => array(
-        'bar' => array(
-          'bis' => 'ter',
-        ),
-      ),
-    );
-    $populator = new Populator($values);
-
-    $this->assertEquals('ter', $populator->get('foo[bar][bis]'));
-  }
-
-  public function testCanGetValueOfFieldsWithUnderscores()
-  {
-    $values = (object) array(
-      'foo_bar' => array(
-        'bar_bis' => 'ter',
-      ),
-    );
-    $populator = new Populator($values);
-
-    $this->assertEquals('ter', $populator->get('foo_bar[bar_bis]'));
-  }
-
-  public function testCanGetRelationships()
-  {
-    $model = new DummyEloquent(array('id' => 1, 'name' => 'foo'));
-    $populator = new Populator($model);
-    $values = array(
-      new DummyEloquent(array('id' => 1, 'name' => 'foo')),
-      new DummyEloquent(array('id' => 3, 'name' => 'bar')),
-    );
-
-    $this->assertEquals($values, $populator->get('roles'));
-  }
-
-  public function testCanGetNestedArrayValues()
-  {
-    $populator = new Populator(array('foo' => array(0 => 'one', 1 => 'two')));
-
-    $this->assertEquals('two', $populator->get('foo[1]'));
-  }
-
-  public function testCanCastModelToArray()
-  {
-    $model = new DummyToArray(array(
-      'user' => new DummyToArray(array('name' => 'foo'))
-    ));
-    $populator = new Populator($model);
-
-    $this->assertEquals('foo', $populator->get('user.name'));
-  }
+	public function testCanPopulateClassOnConstruct()
+	{
+		$populator = new Populator(array('foo', 'bar'));
+
+		$this->assertEquals(array('foo', 'bar'), $populator->all());
+	}
+
+	public function testCanResetValues()
+	{
+		$populator = new Populator(array('foo', 'bar'));
+		$populator->reset();
+
+		$this->assertEquals(array(), $populator->all());
+	}
+
+	public function testCanSetSingleValue()
+	{
+		$populator = new Populator(array('foo', 'bar'));
+		$populator->put(2, 'bar');
+
+		$this->assertEquals(array('foo', 'bar', 'bar'), $populator->all());
+	}
+
+	public function testCanSetValueOnModel()
+	{
+		$model     = new DummyEloquent(array('id' => 1, 'name' => 'foo'));
+		$populator = new Populator($model);
+		$populator->put('foo', 'bar');
+
+		$this->assertEquals('bar', $populator->get('foo'));
+	}
+
+	public function testCanSwapOutValues()
+	{
+		$populator = new Populator(array('foo', 'bar'));
+		$populator->replace(array('bar', 'foo'));
+
+		$this->assertEquals(array('bar', 'foo'), $populator->all());
+	}
+
+	public function testCanGetAttributesAndMutators()
+	{
+		$model     = new DummyEloquent(array('id' => 1, 'name' => 'foo'));
+		$populator = new Populator($model);
+
+		$this->assertEquals('custom', $populator->get('custom'));
+		$this->assertEquals('foo', $populator->get('name'));
+	}
+
+	public function testCanGetValueThroughArrayNotation()
+	{
+		$values    = (object) array(
+			'foo' => array(
+				'bar' => array(
+					'bis' => 'ter',
+				),
+			),
+		);
+		$populator = new Populator($values);
+
+		$this->assertEquals('ter', $populator->get('foo[bar][bis]'));
+	}
+
+	public function testCanGetValueOfFieldsWithUnderscores()
+	{
+		$values    = (object) array(
+			'foo_bar' => array(
+				'bar_bis' => 'ter',
+			),
+		);
+		$populator = new Populator($values);
+
+		$this->assertEquals('ter', $populator->get('foo_bar[bar_bis]'));
+	}
+
+	public function testCanGetRelationships()
+	{
+		$model     = new DummyEloquent(array('id' => 1, 'name' => 'foo'));
+		$populator = new Populator($model);
+		$values    = array(
+			new DummyEloquent(array('id' => 1, 'name' => 'foo')),
+			new DummyEloquent(array('id' => 3, 'name' => 'bar')),
+		);
+
+		$this->assertEquals($values, $populator->get('roles'));
+	}
+
+	public function testCanGetNestedArrayValues()
+	{
+		$populator = new Populator(array('foo' => array(0 => 'one', 1 => 'two')));
+
+		$this->assertEquals('two', $populator->get('foo[1]'));
+	}
+
+	public function testCanCastModelToArray()
+	{
+		$model     = new DummyToArray(array(
+			'user' => new DummyToArray(array('name' => 'foo'))
+		));
+		$populator = new Populator($model);
+
+		$this->assertEquals('foo', $populator->get('user.name'));
+	}
 }
diff --git a/tests/TestCases/ContainerTestCase.php b/tests/TestCases/ContainerTestCase.php
index aa7c628c..d21e9300 100644
--- a/tests/TestCases/ContainerTestCase.php
+++ b/tests/TestCases/ContainerTestCase.php
@@ -1,289 +1,311 @@
 <?php
 namespace Former\TestCases;
 
-use Illuminate\Container\Container;
 use Former\FormerServiceProvider;
-use PHPUnit_Framework_TestCase;
+use Illuminate\Container\Container;
 use Mockery;
+use PHPUnit_Framework_TestCase;
 
 /**
  * A TestCase that creates a mocked Container to use as core
  */
 abstract class ContainerTestCase extends PHPUnit_Framework_TestCase
 {
-  /**
-   * A cache of the container
-   *
-   * @var Container
-   */
-  protected static $appCache;
-
-  /**
-   * The current instance of the Container
-   *
-   * @var Container
-   */
-  protected $app;
+	/**
+	 * A cache of the container
+	 *
+	 * @var Container
+	 */
+	protected static $appCache;
 
-  /**
-   * Build the IoC Container for the tests
-   */
-  public function setUp()
-  {
-    if (!static::$appCache) {
-      $this->app = FormerServiceProvider::make();
+	/**
+	 * The current instance of the Container
+	 *
+	 * @var Container
+	 */
+	protected $app;
 
-      // Setup Illuminate
-      $this->mockSession();
-      $this->mockTranslator();
-      $this->mockUrl();
-      $this->mockValidator();
+	/**
+	 * Build the IoC Container for the tests
+	 */
+	public function setUp()
+	{
+		if (!static::$appCache) {
+			$this->app = FormerServiceProvider::make();
 
-      static::$appCache = $this->app;
-    }
+			// Setup Illuminate
+			$this->mockSession();
+			$this->mockTranslator();
+			$this->mockUrl();
+			$this->mockValidator();
 
-    $this->app = static::$appCache;
-    $this->mockConfig();
-    $this->mockRequest();
-  }
+			static::$appCache = $this->app;
+		}
 
-  /**
-   * Bind mocked expectations into the Container
-   *
-   * @param string $binding
-   * @param string $name
-   * @param Closure $expectations
-   *
-   * @return Mockery
-   */
-  public function mock($binding, $name, $expectations)
-  {
-    $mocked = Mockery::mock($name);
-    $mocked = $expectations($mocked);
-    if ($mocked instanceof Mockery\CompositeExpectation) {
-      $mocked = $mocked->mock();
-    }
+		$this->app = static::$appCache;
+		$this->mockConfig();
+		$this->mockRequest();
+	}
 
-    // Bind into container
-    $this->$binding = $mocked;
+	/**
+	 * Bind mocked expectations into the Container
+	 *
+	 * @param string  $binding
+	 * @param string  $name
+	 * @param Closure $expectations
+	 *
+	 * @return Mockery
+	 */
+	public function mock($binding, $name, $expectations)
+	{
+		$mocked = Mockery::mock($name);
+		$mocked = $expectations($mocked);
+		if ($mocked instanceof Mockery\CompositeExpectation) {
+			$mocked = $mocked->mock();
+		}
 
-    return $mocked;
-  }
+		// Bind into container
+		$this->$binding = $mocked;
 
-  /**
-   * Get an instance on the Container
-   *
-   * @param  string $key
-   *
-   * @return object
-   */
-  public function __get($key)
-  {
-    return $this->app->make($key);
-  }
+		return $mocked;
+	}
 
-  /**
-   * Set an instance on the Container
-   *
-   * @param string $key
-   * @param object $value
-   */
-  public function __set($key, $value)
-  {
-    return $this->app[$key] = $value;
-  }
+	/**
+	 * Get an instance on the Container
+	 *
+	 * @param  string $key
+	 *
+	 * @return object
+	 */
+	public function __get($key)
+	{
+		return $this->app->make($key);
+	}
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// CONTAINER ///////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	/**
+	 * Set an instance on the Container
+	 *
+	 * @param string $key
+	 * @param object $value
+	 */
+	public function __set($key, $value)
+	{
+		return $this->app[$key] = $value;
+	}
 
-  /**
-   * Mock the Config repository
-   *
-   * @return Mockery
-   */
-  protected function mockConfig(array $options = array())
-  {
-    $defaults = include realpath(__DIR__.'/../../src/config/config.php');
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// CONTAINER ///////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-    $options  = array_merge($defaults, array(
-      'automatic_label'         => true,
-      'capitalize_translations' => true,
-      'default_form_type'       => 'horizontal',
-      'error_messages'          => true,
-      'fetch_errors'            => false,
-      'framework'               => 'TwitterBootstrap',
-      'icon_prefix'             => null,
-      'icon_set'                => null,
-      'icon_tag'                => null,
-      'live_validation'         => true,
-      'push_checkboxes'         => false,
-      'required_class'          => 'required',
-      'required_text'           => '*',
-      'translate_from'          => 'validation.attributes',
-      'unchecked_value'         => '',
-      'translatable'            => array('help', 'inlineHelp', 'blockHelp', 'placeholder', 'data_placeholder', 'label'),
+	/**
+	 * Mock the Config repository
+	 *
+	 * @return Mockery
+	 */
+	protected function mockConfig(array $options = array())
+	{
+		$defaults = include realpath(__DIR__.'/../../src/config/config.php');
 
-      'Nude.icon.prefix'                    => 'icon',
-      'Nude.icon.set'                       => null,
-      'Nude.icon.tag'                       => 'i',
-      'Nude.labelWidths'                    => null,
-      'TwitterBootstrap.icon.prefix'        => 'icon',
-      'TwitterBootstrap.icon.set'           => null,
-      'TwitterBootstrap.icon.tag'           => 'i',
-      'TwitterBootstrap.labelWidths'        => null,
-      'TwitterBootstrap3.icon.prefix'       => 'glyphicon',
-      'TwitterBootstrap3.icon.set'          => 'glyphicon',
-      'TwitterBootstrap3.icon.tag'          => 'span',
-      'TwitterBootstrap3.labelWidths'       => array('large' => 2, 'small' => 4),
-      'TwitterBootstrap3.viewports'         => array('large' => 'lg', 'medium' => 'md', 'small' => 'sm', 'mini' => 'xs'),
-      'ZurbFoundation.icon.prefix'          => 'fi',
-      'ZurbFoundation.icon.set'             => null,
-      'ZurbFoundation.icon.tag'             => 'i',
-      'ZurbFoundation.labelWidths'          => array('large' => 2, 'small' => 4),
-      'ZurbFoundation.viewports'            => array('large' => '', 'medium' => null, 'small' => 'mobile-', 'mini' => null),
-      'ZurbFoundation.wrappedLabelClasses'  => array('right', 'inline'),
-      'ZurbFoundation.error_classes'       => array('class' => 'alert-box alert error'),
-      'ZurbFoundation4.icon.prefix'         => 'foundicon',
-      'ZurbFoundation4.icon.set'            => 'general',
-      'ZurbFoundation4.icon.tag'            => 'i',
-      'ZurbFoundation4.labelWidths'         => array('small' => 3),
-      'ZurbFoundation4.viewports'           => array('large' => 'large', 'medium' => null, 'small' => 'small', 'mini' => null),
-      'ZurbFoundation4.wrappedLabelClasses' => array('right','inline'),
-      'ZurbFoundation4.error_classes'       => array('class' => 'alert-box radius warning'),
-    ), $options);
+		$options = array_merge($defaults, array(
+			'automatic_label'                     => true,
+			'capitalize_translations'             => true,
+			'default_form_type'                   => 'horizontal',
+			'error_messages'                      => true,
+			'fetch_errors'                        => false,
+			'framework'                           => 'TwitterBootstrap',
+			'icon_prefix'                         => null,
+			'icon_set'                            => null,
+			'icon_tag'                            => null,
+			'live_validation'                     => true,
+			'push_checkboxes'                     => false,
+			'required_class'                      => 'required',
+			'required_text'                       => '*',
+			'translate_from'                      => 'validation.attributes',
+			'unchecked_value'                     => '',
+			'translatable'                        => array(
+				'help',
+				'inlineHelp',
+				'blockHelp',
+				'placeholder',
+				'data_placeholder',
+				'label'
+			),
+			'Nude.icon.prefix'                    => 'icon',
+			'Nude.icon.set'                       => null,
+			'Nude.icon.tag'                       => 'i',
+			'Nude.labelWidths'                    => null,
+			'TwitterBootstrap.icon.prefix'        => 'icon',
+			'TwitterBootstrap.icon.set'           => null,
+			'TwitterBootstrap.icon.tag'           => 'i',
+			'TwitterBootstrap.labelWidths'        => null,
+			'TwitterBootstrap3.icon.prefix'       => 'glyphicon',
+			'TwitterBootstrap3.icon.set'          => 'glyphicon',
+			'TwitterBootstrap3.icon.tag'          => 'span',
+			'TwitterBootstrap3.labelWidths'       => array('large' => 2, 'small' => 4),
+			'TwitterBootstrap3.viewports'         => array('large'  => 'lg',
+			                                               'medium' => 'md',
+			                                               'small'  => 'sm',
+			                                               'mini'   => 'xs'
+			),
+			'ZurbFoundation.icon.prefix'          => 'fi',
+			'ZurbFoundation.icon.set'             => null,
+			'ZurbFoundation.icon.tag'             => 'i',
+			'ZurbFoundation.labelWidths'          => array('large' => 2, 'small' => 4),
+			'ZurbFoundation.viewports'            => array(
+				'large'  => '',
+				'medium' => null,
+				'small'  => 'mobile-',
+				'mini'   => null
+			),
+			'ZurbFoundation.wrappedLabelClasses'  => array('right', 'inline'),
+			'ZurbFoundation.error_classes'        => array('class' => 'alert-box alert error'),
+			'ZurbFoundation4.icon.prefix'         => 'foundicon',
+			'ZurbFoundation4.icon.set'            => 'general',
+			'ZurbFoundation4.icon.tag'            => 'i',
+			'ZurbFoundation4.labelWidths'         => array('small' => 3),
+			'ZurbFoundation4.viewports'           => array(
+				'large'  => 'large',
+				'medium' => null,
+				'small'  => 'small',
+				'mini'   => null
+			),
+			'ZurbFoundation4.wrappedLabelClasses' => array('right', 'inline'),
+			'ZurbFoundation4.error_classes'       => array('class' => 'alert-box radius warning'),
+		), $options);
 
-    return $this->mock('config', 'Config', function ($mock) use ($options) {
-      $mock->shouldReceive('application.encoding', Mockery::any())->andReturn('UTF-8');
-      $mock->shouldReceive('set')->with(Mockery::any(), Mockery::any());
+		return $this->mock('config', 'Config', function ($mock) use ($options) {
+			$mock->shouldReceive('application.encoding', Mockery::any())->andReturn('UTF-8');
+			$mock->shouldReceive('set')->with(Mockery::any(), Mockery::any());
 
-      foreach ($options as $key => $value) {
-        $mock->shouldReceive('get')->with('former::'.$key)->andReturn($value);
-        $mock->shouldReceive('get')->with('former::'.$key, Mockery::any())->andReturn($value);
-      }
+			foreach ($options as $key => $value) {
+				$mock->shouldReceive('get')->with('former::'.$key)->andReturn($value);
+				$mock->shouldReceive('get')->with('former::'.$key, Mockery::any())->andReturn($value);
+			}
 
-      return $mock;
-    });
-  }
+			return $mock;
+		});
+	}
 
-  /**
-   * Mock the UrlGenerator
-   *
-   * @return Mockery
-   */
-  protected function mockUrl()
-  {
-    $request = $this->mockRequest();
+	/**
+	 * Mock the UrlGenerator
+	 *
+	 * @return Mockery
+	 */
+	protected function mockUrl()
+	{
+		$request = $this->mockRequest();
 
-    $this->mock('url', 'Illuminate\Routing\UrlGenerator', function ($mock) use ($request) {
-      return $mock
-        ->shouldReceive('getRequest')->andReturn($request)
-        ->shouldReceive('to')->andReturnUsing(function ($url) {
-          return $url == '#' ? $url : 'https://test/en/'.$url;
-        })
-        ->shouldReceive('action')->with('UsersController@edit', array(2))->andReturn('/users/2/edit')
-        ->shouldReceive('action')->with('UsersController@edit', 2)->andReturn('/users/2/edit')
-        ->shouldReceive('route')->with('user.edit', array(2))->andReturn('/users/2/edit')
-        ->shouldReceive('route')->with('user.edit', 2)->andReturn('/users/2/edit');
-    });
-  }
+		$this->mock('url', 'Illuminate\Routing\UrlGenerator', function ($mock) use ($request) {
+			return $mock
+				->shouldReceive('getRequest')->andReturn($request)
+				->shouldReceive('to')->andReturnUsing(function ($url) {
+					return $url == '#' ? $url : 'https://test/en/'.$url;
+				})
+				->shouldReceive('action')->with('UsersController@edit', array(2))->andReturn('/users/2/edit')
+				->shouldReceive('action')->with('UsersController@edit', 2)->andReturn('/users/2/edit')
+				->shouldReceive('route')->with('user.edit', array(2))->andReturn('/users/2/edit')
+				->shouldReceive('route')->with('user.edit', 2)->andReturn('/users/2/edit');
+		});
+	}
 
-  /**
-   * Mock a Validator instance
-   *
-   * @return Mockery
-   */
-  protected function mockValidator()
-  {
-    $messageBag = $this->mockMessageBag(array(
-      'required' => 'The required field is required.'
-    ));
+	/**
+	 * Mock a Validator instance
+	 *
+	 * @return Mockery
+	 */
+	protected function mockValidator()
+	{
+		$messageBag = $this->mockMessageBag(array(
+			'required' => 'The required field is required.'
+		));
 
-    return $this->mock('validator', 'Illuminate\Validation\Validator', function ($mock) use ($messageBag) {
-      return $mock->shouldReceive('getMessageBag')->andReturn($messageBag);
-    });
-  }
+		return $this->mock('validator', 'Illuminate\Validation\Validator', function ($mock) use ($messageBag) {
+			return $mock->shouldReceive('getMessageBag')->andReturn($messageBag);
+		});
+	}
 
-  /**
-   * Mock the current Session store
-   *
-   * @param array $errors
-   *
-   * @return Mockery
-   */
-  protected function mockSession(array $errors = array())
-  {
-    $messageBag = $this->mockMessageBag($errors);
+	/**
+	 * Mock the current Session store
+	 *
+	 * @param array $errors
+	 *
+	 * @return Mockery
+	 */
+	protected function mockSession(array $errors = array())
+	{
+		$messageBag = $this->mockMessageBag($errors);
 
-    return $this->mock('session', 'Illuminate\Session\Store', function ($mock) use ($messageBag, $errors) {
-      $mock->shouldReceive('getToken')->andReturn('csrf_token');
-      if ($errors) {
-        $mock->shouldReceive('has')->with('errors')->andReturn(true);
-        $mock->shouldReceive('get')->with('errors')->andReturn($messageBag);
-      } else {
-        $mock->shouldReceive('has')->with('errors')->andReturn(false);
-        $mock->shouldReceive('get')->with('errors')->andReturn(null);
-      }
+		return $this->mock('session', 'Illuminate\Session\Store', function ($mock) use ($messageBag, $errors) {
+			$mock->shouldReceive('getToken')->andReturn('csrf_token');
+			if ($errors) {
+				$mock->shouldReceive('has')->with('errors')->andReturn(true);
+				$mock->shouldReceive('get')->with('errors')->andReturn($messageBag);
+			} else {
+				$mock->shouldReceive('has')->with('errors')->andReturn(false);
+				$mock->shouldReceive('get')->with('errors')->andReturn(null);
+			}
 
-      return $mock;
-    });
-  }
+			return $mock;
+		});
+	}
 
-  /**
-   * Mock a MessageBag instance
-   *
-   * @param  array $errors
-   *
-   * @return Mockery
-   */
-  protected function mockMessageBag(array $errors = array())
-  {
-    $messages = Mockery::mock('MessageBag');
-    foreach ($errors as $key => $value) {
-      $messages->shouldReceive('has')->with($key)->andReturn(true);
-      $messages->shouldReceive('first')->with($key)->andReturn($value);
-    }
-    $messages->shouldReceive('first')->withAnyArgs()->andReturn(null);
+	/**
+	 * Mock a MessageBag instance
+	 *
+	 * @param  array $errors
+	 *
+	 * @return Mockery
+	 */
+	protected function mockMessageBag(array $errors = array())
+	{
+		$messages = Mockery::mock('MessageBag');
+		foreach ($errors as $key => $value) {
+			$messages->shouldReceive('has')->with($key)->andReturn(true);
+			$messages->shouldReceive('first')->with($key)->andReturn($value);
+		}
+		$messages->shouldReceive('first')->withAnyArgs()->andReturn(null);
 
-    return $messages;
-  }
+		return $messages;
+	}
 
-  /**
-   * Mock the localization manager
-   *
-   * @return Mockery
-   */
-  protected function mockTranslator()
-  {
-    return $this->mock('translator', 'Illuminate\Translation\Translator', function ($mock) {
-      return $mock
-        ->shouldReceive('get')->with('pagination.next')->andReturn('Next')
-        ->shouldReceive('get')->with('pagination')->andReturn(array('previous' => 'Previous', 'next' => 'Next'))
-        ->shouldReceive('get')->with('validation.attributes.field_name_with_underscore')->andReturn(false)
-        ->shouldReceive('get')->with('validation.attributes.address.city')->andReturn('City')
-        ->shouldReceive('get')->withAnyArgs()->andReturnUsing(function ($key) { return $key; })
-        ->shouldReceive('has')->with('field_name_with_underscore')->andReturn(false)
-        ->shouldReceive('has')->with('address.city')->andReturn(false)
-        ->shouldReceive('has')->with('address[city]')->andReturn(false)
-        ->shouldReceive('has')->withAnyArgs()->andReturn(true);
-    });
-  }
+	/**
+	 * Mock the localization manager
+	 *
+	 * @return Mockery
+	 */
+	protected function mockTranslator()
+	{
+		return $this->mock('translator', 'Illuminate\Translation\Translator', function ($mock) {
+			return $mock
+				->shouldReceive('get')->with('pagination.next')->andReturn('Next')
+				->shouldReceive('get')->with('pagination')->andReturn(array('previous' => 'Previous', 'next' => 'Next'))
+				->shouldReceive('get')->with('validation.attributes.field_name_with_underscore')->andReturn(false)
+				->shouldReceive('get')->with('validation.attributes.address.city')->andReturn('City')
+				->shouldReceive('get')->withAnyArgs()->andReturnUsing(function ($key) {
+						return $key;
+					})
+				->shouldReceive('has')->with('field_name_with_underscore')->andReturn(false)
+				->shouldReceive('has')->with('address.city')->andReturn(false)
+				->shouldReceive('has')->with('address[city]')->andReturn(false)
+				->shouldReceive('has')->withAnyArgs()->andReturn(true);
+		});
+	}
 
-  /**
-   * Mock the Request instance
-   *
-   * @return Mockery
-   */
-  protected function mockRequest()
-  {
-    return $this->mock('request', 'Illuminate\Http\Request', function ($mock) {
-      return $mock
-        ->shouldReceive('url')->andReturn('#')
-        ->shouldReceive('input')->andReturn(null)->byDefault()
-        ->shouldReceive('old')->andReturn(null)
-        ->shouldReceive('path')->andReturnUsing(function () {
-          return 'https://test/en/';
-        });
-    });
-  }
+	/**
+	 * Mock the Request instance
+	 *
+	 * @return Mockery
+	 */
+	protected function mockRequest()
+	{
+		return $this->mock('request', 'Illuminate\Http\Request', function ($mock) {
+			return $mock
+				->shouldReceive('url')->andReturn('#')
+				->shouldReceive('input')->andReturn(null)->byDefault()
+				->shouldReceive('old')->andReturn(null)
+				->shouldReceive('path')->andReturnUsing(function () {
+					return 'https://test/en/';
+				});
+		});
+	}
 }
diff --git a/tests/TestCases/FormerTests.php b/tests/TestCases/FormerTests.php
index 7a7c7765..1e69131b 100644
--- a/tests/TestCases/FormerTests.php
+++ b/tests/TestCases/FormerTests.php
@@ -10,312 +10,317 @@
  */
 abstract class FormerTests extends ContainerTestCase
 {
-  /**
-   * Setup the app for testing
-   */
-  public function setUp()
-  {
-    parent::setUp();
+	/**
+	 * Setup the app for testing
+	 */
+	public function setUp()
+	{
+		parent::setUp();
 
-    // Reset some parameters
-    $this->resetLabels();
-    $this->former->framework('TwitterBootstrap');
-    $this->former->horizontal_open()->__toString();
-  }
+		// Reset some parameters
+		$this->resetLabels();
+		$this->former->framework('TwitterBootstrap');
+		$this->former->horizontal_open()->__toString();
+	}
 
-  /**
-   * Tear down the tests
-   *
-   * @return void
-   */
-  public function tearDown()
-  {
-    $this->former->closeGroup();
-    $this->former->close();
-    Mockery::close();
-  }
+	/**
+	 * Tear down the tests
+	 *
+	 * @return void
+	 */
+	public function tearDown()
+	{
+		$this->former->closeGroup();
+		$this->former->close();
+		Mockery::close();
+	}
 
-  /**
-   * Reset registered labels
-   *
-   * @return void
-   */
-  public function resetLabels()
-  {
-    $this->former->labels = array();
-    $this->former->ids    = array();
-  }
+	/**
+	 * Reset registered labels
+	 *
+	 * @return void
+	 */
+	public function resetLabels()
+	{
+		$this->former->labels = array();
+		$this->former->ids    = array();
+	}
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// DUMMIES /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// DUMMIES /////////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  protected $checkables = array(
-    'Foo' => array(
-      'data-foo' => 'bar',
-      'value'    => 'bar',
-      'name'     => 'foo',
-    ),
-    'Bar' => array(
-      'data-foo' => 'bar',
-      'value'    => 'bar',
-      'name'     => 'foo',
-      'id'       => 'bar',
-    ),
-  );
+	protected $checkables = array(
+		'Foo' => array(
+			'data-foo' => 'bar',
+			'value'    => 'bar',
+			'name'     => 'foo',
+		),
+		'Bar' => array(
+			'data-foo' => 'bar',
+			'value'    => 'bar',
+			'name'     => 'foo',
+			'id'       => 'bar',
+		),
+	);
 
-  protected $radioCheckables = array(
-    'Foo' => array(
-      'data-foo' => 'bar',
-      'value'    => 'foo',
-      'name'     => 'foo',
-    ),
-    'Bar' => array(
-      'data-foo' => 'bar',
-      'value'    => 'bar',
-      'name'     => 'foo',
-      'id'       => 'bar',
-    ),
-  );
+	protected $radioCheckables = array(
+		'Foo' => array(
+			'data-foo' => 'bar',
+			'value'    => 'foo',
+			'name'     => 'foo',
+		),
+		'Bar' => array(
+			'data-foo' => 'bar',
+			'value'    => 'bar',
+			'name'     => 'foo',
+			'id'       => 'bar',
+		),
+	);
 
-  protected $testAttributes = array(
-    'class'    => 'foo',
-    'data-foo' => 'bar',
-  );
+	protected $testAttributes = array(
+		'class'    => 'foo',
+		'data-foo' => 'bar',
+	);
 
-  ////////////////////////////////////////////////////////////////////
-  ///////////////////////////// MATCHERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	///////////////////////////// MATCHERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Match a field
-   *
-   * @param  array  $attributes
-   * @param  string $type
-   * @param  string $name
-   *
-   * @return array
-   */
-  protected function matchField($attributes = array(), $type = 'text', $name = 'foo')
-  {
-    $attributes = array_merge($attributes, array('type' => $type, 'name' => $name));
-    if ($type == 'hidden') {
-      return array('tag' => 'input', 'attributes' => $attributes);
-    }
+	/**
+	 * Match a field
+	 *
+	 * @param  array  $attributes
+	 * @param  string $type
+	 * @param  string $name
+	 *
+	 * @return array
+	 */
+	protected function matchField($attributes = array(), $type = 'text', $name = 'foo')
+	{
+		$attributes = array_merge($attributes, array('type' => $type, 'name' => $name));
+		if ($type == 'hidden') {
+			return array('tag' => 'input', 'attributes' => $attributes);
+		}
 
-    return array(
-      'tag'        => 'input',
-      'id'         => $name,
-      'attributes' => $attributes,
-    );
-  }
+		return array(
+			'tag'        => 'input',
+			'id'         => $name,
+			'attributes' => $attributes,
+		);
+	}
 
-  /**
-   * Match a label
-   *
-   * @param  string  $name
-   * @param  string  $field
-   * @param  boolean $required
-   *
-   * @return array
-   */
-  protected function matchLabel($name = 'foo', $field = 'foo', $required = false)
-  {
-    $text = str_replace('[]', null, $name);
-    if ($required) {
-      $text .= '*';
-    }
+	/**
+	 * Match a label
+	 *
+	 * @param  string  $name
+	 * @param  string  $field
+	 * @param  boolean $required
+	 *
+	 * @return array
+	 */
+	protected function matchLabel($name = 'foo', $field = 'foo', $required = false)
+	{
+		$text = str_replace('[]', null, $name);
+		if ($required) {
+			$text .= '*';
+		}
 
-    return array(
-      'tag'     => 'label',
-      'content' => $text,
-      'attributes' => array(
-        'for'   => $field,
-        'class' => 'control-label',
-      ),
-    );
-  }
+		return array(
+			'tag'        => 'label',
+			'content'    => $text,
+			'attributes' => array(
+				'for'   => $field,
+				'class' => 'control-label',
+			),
+		);
+	}
 
-  /**
-   * Match a control group
-   *
-   * @return array
-   */
-  protected function matchControlGroup()
-  {
-    return array(
-      'tag' => 'div',
-      'attributes' => array(
-        'class' => 'control-group',
-      ),
-      'child' => array(
-        'tag' => 'div',
-        'attributes' => array('class' => 'controls'),
-      ),
-    );
-  }
+	/**
+	 * Match a control group
+	 *
+	 * @return array
+	 */
+	protected function matchControlGroup()
+	{
+		return array(
+			'tag'        => 'div',
+			'attributes' => array(
+				'class' => 'control-group',
+			),
+			'child'      => array(
+				'tag'        => 'div',
+				'attributes' => array('class' => 'controls'),
+			),
+		);
+	}
 
-  /**
-   * Match a button
-   *
-   * @param  string $class
-   * @param  string $text
-   * @param  array  $attributes
-   *
-   * @return array
-   */
-  protected function matchButton($class, $text, $attributes = array())
-  {
-    $matcher = array(
-      'tag'        => 'button',
-      'content'    => $text,
-      'attributes' => array(
-        'class' => $class,
-      ),
-    );
+	/**
+	 * Match a button
+	 *
+	 * @param  string $class
+	 * @param  string $text
+	 * @param  array  $attributes
+	 *
+	 * @return array
+	 */
+	protected function matchButton($class, $text, $attributes = array())
+	{
+		$matcher = array(
+			'tag'        => 'button',
+			'content'    => $text,
+			'attributes' => array(
+				'class' => $class,
+			),
+		);
 
-    // Supplementary attributes
-    if ($attributes) {
-      $matcher['attributes'] = array_merge($matcher['attributes'], $attributes);
-    }
+		// Supplementary attributes
+		if ($attributes) {
+			$matcher['attributes'] = array_merge($matcher['attributes'], $attributes);
+		}
 
-    return $matcher;
-  }
+		return $matcher;
+	}
 
-  /**
-   * Match an input-type button
-   *
-   * @param  string $class
-   * @param  string $text
-   * @param  string $type
-   *
-   * @return array
-   */
-  protected function matchInputButton($class, $text, $type = 'submit')
-  {
-    return array(
-      'tag'        => 'input',
-      'attributes' => array(
-        'type'  => $type,
-        'value' => $text,
-        'class' => $class,
-      ),
-    );
-  }
+	/**
+	 * Match an input-type button
+	 *
+	 * @param  string $class
+	 * @param  string $text
+	 * @param  string $type
+	 *
+	 * @return array
+	 */
+	protected function matchInputButton($class, $text, $type = 'submit')
+	{
+		return array(
+			'tag'        => 'input',
+			'attributes' => array(
+				'type'  => $type,
+				'value' => $text,
+				'class' => $class,
+			),
+		);
+	}
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// HELPERS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// HELPERS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Build a list of HTML attributes from an array
-   *
-   * @param  array  $attributes
-   * @return string
-   */
-  public function attributes($attributes)
-  {
-    $html = array();
+	/**
+	 * Build a list of HTML attributes from an array
+	 *
+	 * @param  array $attributes
+	 *
+	 * @return string
+	 */
+	public function attributes($attributes)
+	{
+		$html = array();
 
-    foreach ((array) $attributes as $key => $value) {
-      // For numeric keys, we will assume that the key and the value are the
-      // same, as this will convert HTML attributes such as "required" that
-      // may be specified as required="required", etc.
-      if (is_numeric($key)) {
-        $key = $value;
-      }
+		foreach ((array) $attributes as $key => $value) {
+			// For numeric keys, we will assume that the key and the value are the
+			// same, as this will convert HTML attributes such as "required" that
+			// may be specified as required="required", etc.
+			if (is_numeric($key)) {
+				$key = $value;
+			}
 
-      if (!is_null($value)) {
-        $html[] = $key.'="'.$value.'"';
-      }
-    }
+			if (!is_null($value)) {
+				$html[] = $key.'="'.$value.'"';
+			}
+		}
 
-    return (count($html) > 0) ? ' '.implode(' ', $html) : '';
-  }
+		return (count($html) > 0) ? ' '.implode(' ', $html) : '';
+	}
 
-  ////////////////////////////////////////////////////////////////////
-  ////////////////////////////// ASSERTIONS //////////////////////////
-  ////////////////////////////////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////
+	////////////////////////////// ASSERTIONS //////////////////////////
+	////////////////////////////////////////////////////////////////////
 
-  /**
-   * Asserts that the input is a control group
-   *
-   * @param  string $input
-   *
-   * @return boolean
-   */
-  protected function assertControlGroup($input)
-  {
-    $this->assertLabel($input);
-    $this->assertHTML($this->matchControlGroup(), $input);
-  }
+	/**
+	 * Asserts that the input is a control group
+	 *
+	 * @param  string $input
+	 *
+	 * @return boolean
+	 */
+	protected function assertControlGroup($input)
+	{
+		$this->assertLabel($input);
+		$this->assertHTML($this->matchControlGroup(), $input);
+	}
 
-  /**
-   * Asserts that the input is a label
-   *
-   * @param  string $input
-   *
-   * @return boolean
-   */
-  protected function assertLabel($input, $name = 'foo', $required = false)
-  {
-    $this->assertHTML($this->matchLabel(ucfirst($name), $name, $required), $input);
-  }
+	/**
+	 * Asserts that the input is a label
+	 *
+	 * @param  string $input
+	 *
+	 * @return boolean
+	 */
+	protected function assertLabel($input, $name = 'foo', $required = false)
+	{
+		$this->assertHTML($this->matchLabel(ucfirst($name), $name, $required), $input);
+	}
 
-  /**
-   * Matches a Control Group
-   *
-   * @param  string $input
-   * @param  string $label
-   *
-   * @return boolean
-   */
-  protected function controlGroup($input = '<input type="text" name="foo" id="foo">', $label = '<label for="foo" class="control-label">Foo</label>')
-  {
-    return '<div class="control-group">'.$label.'<div class="controls">'.$input.'</div></div>';
-  }
+	/**
+	 * Matches a Control Group
+	 *
+	 * @param  string $input
+	 * @param  string $label
+	 *
+	 * @return boolean
+	 */
+	protected function controlGroup(
+		$input = '<input type="text" name="foo" id="foo">',
+		$label = '<label for="foo" class="control-label">Foo</label>'
+	) {
+		return '<div class="control-group">'.$label.'<div class="controls">'.$input.'</div></div>';
+	}
 
-  /**
-   * Matches a Form Group
-   *
-   * @param  string $input
-   * @param  string $label
-   *
-   * @return boolean
-   */
-  protected function formGroup($input = '<input type="text" name="foo" id="foo">', $label = '<label for="foo" class="control-label col-lg-2 col-sm-4">Foo</label>')
-  {
-    return '<div class="form-group">'.$label.'<div class="col-lg-10 col-sm-8">'.$input.'</div></div>';
-  }
+	/**
+	 * Matches a Form Group
+	 *
+	 * @param  string $input
+	 * @param  string $label
+	 *
+	 * @return boolean
+	 */
+	protected function formGroup(
+		$input = '<input type="text" name="foo" id="foo">',
+		$label = '<label for="foo" class="control-label col-lg-2 col-sm-4">Foo</label>'
+	) {
+		return '<div class="form-group">'.$label.'<div class="col-lg-10 col-sm-8">'.$input.'</div></div>';
+	}
 
-  /**
-   * Matches a required Control Group
-   *
-   * @param  string $input
-   * @param  string $label
-   *
-   * @return boolean
-   */
-  protected function controlGroupRequired($input, $label = '<label for="foo" class="control-label">Foo</label>')
-  {
-    return '<div class="control-group required">'.$label.'<div class="controls">'.$input.'</div></div>';
-  }
+	/**
+	 * Matches a required Control Group
+	 *
+	 * @param  string $input
+	 * @param  string $label
+	 *
+	 * @return boolean
+	 */
+	protected function controlGroupRequired($input, $label = '<label for="foo" class="control-label">Foo</label>')
+	{
+		return '<div class="control-group required">'.$label.'<div class="controls">'.$input.'</div></div>';
+	}
 
-  /**
-   * Assert that a piece of HTML matches an array
-   *
-   * @param  array  $matcher
-   * @param  string $input
-   *
-   * @return boolean
-   */
-  public function assertHTML($matcher, $input)
-  {
-    $this->assertTag(
-      $matcher,
-      $input,
-      "Failed asserting that the HTML matches the provided format :\n\t"
-        .$input."\n\t"
-        .json_encode($matcher));
-  }
+	/**
+	 * Assert that a piece of HTML matches an array
+	 *
+	 * @param  array  $matcher
+	 * @param  string $input
+	 *
+	 * @return boolean
+	 */
+	public function assertHTML($matcher, $input)
+	{
+		$this->assertTag(
+			$matcher,
+			$input,
+			"Failed asserting that the HTML matches the provided format :\n\t"
+			.$input."\n\t"
+			.json_encode($matcher));
+	}
 }
diff --git a/tests/Traits/FieldTest.php b/tests/Traits/FieldTest.php
index 64968a0c..79171747 100644
--- a/tests/Traits/FieldTest.php
+++ b/tests/Traits/FieldTest.php
@@ -6,189 +6,193 @@
 
 class FieldTest extends FormerTests
 {
-  ////////////////////////////////////////////////////////////////////
-  /////////////////////////// DATA PROVIDERS /////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function provideSizes()
-  {
-    $_sizes = array('mini', 'small', 'medium', 'large', 'xlarge', 'xxlarge', 'span1', 'span6', 'span12', 'foo');
-    foreach($_sizes as $s) $sizes[] = array($s);
-
-    return $sizes;
-  }
-
-  ////////////////////////////////////////////////////////////////////
-  //////////////////////////////// TESTS /////////////////////////////
-  ////////////////////////////////////////////////////////////////////
-
-  public function testCanCreateFieldsOutsideForms()
-  {
-      $this->former->close();
-      $field = $this->former->text('foo')->raw();
-
-      $this->assertEquals('<input id="foo" type="text" name="foo">', $field->__toString());
-  }
-
-  public function testCanChangeTheFieldIdAndKeepLabelInSync()
-  {
-    $field = $this->former->text('foo');
-    $field->id('bar');
-
-    $matcher = '<div class="control-group"><label for="bar" class="control-label">Foo</label><div class="controls"><input id="bar" type="text" name="foo"></div></div>';
-
-    $this->assertEquals($matcher, $field->__toString());
-  }
-
-  public function testCanChangeTypeMidCourse()
-  {
-    $field = $this->former->text('foo')->setType('email');
-
-    $this->assertEquals('email', $field->getType());
-  }
-
-  public function testCanRenameField()
-  {
-    $input = $this->former->text('foo')->name('bar')->__toString();
-    $matcher = $this->controlGroup(
-      '<input id="bar" type="text" name="bar">',
-      '<label for="bar" class="control-label">Bar</label>');
-
-    $this->assertEquals($matcher, $input);
-  }
-
-  public function testCanSetValueOnFields()
-  {
-    $matcher = $this->controlGroup('<input id="foo" type="text" name="foo" value="bar">');
-    $static = $this->former->text('foo')->value('bar')->__toString();
-    $this->assertHTML($this->matchField(), $static);
-    $this->assertHTML($this->matchControlGroup(), $static);
-
-    $this->resetLabels();
-    $input  = $this->former->text('foo', null, 'bar')->__toString();
-    $this->assertHTML($this->matchField(), $input);
-    $this->assertHTML($this->matchControlGroup(), $input);
-  }
-
-  public function testCanForceValueOnFields()
-  {
-    $this->former->populate(array('foo' => 'unbar'));
-    $static = $this->former->text('foo')->forceValue('bar')->__toString();
-    $matcher = $this->controlGroup('<input id="foo" type="text" name="foo" value="bar">');
-
-    $this->assertEquals($matcher, $static);
-  }
-
-  public function testCanCreateViaMagicAttribute()
-  {
-    $static = $this->former->text('foo')->class('foo')->data_bar('bar')->__toString();
-    $this->assertHTML($this->matchField(), $static);
-    $this->assertHTML($this->matchControlGroup(), $static);
-
-    $this->resetLabels();
-    $input  = $this->former->text('foo', null, null, array('class' => 'foo', 'data-bar' => 'bar'))->__toString();
-    $this->assertHTML($this->matchField(), $input);
-    $this->assertHTML($this->matchControlGroup(), $input);
-  }
-
-  public function testCanCreateViaMagicAttributeUnvalue()
-  {
-    $static = $this->former->text('foo')->require()->__toString();
-    $matcher = $this->controlGroup('<input require="true" type="text" name="foo" id="foo">');
-
-    $this->assertHTML($this->matchField(), $static);
-    $this->assertHTML($this->matchControlGroup(), $static);
-  }
-
-  public function testCanSetAttributes()
-  {
-    $attributes = array('class' => 'foo', 'data-foo' => 'bar');
-
-    $static = $this->former->text('foo')->require()->setAttributes($attributes)->__toString();
-
-    $field = $this->matchField();
-    $field['attributes']['require'] = 'true';
-    $field['attributes']['class'] = 'foo';
-    $field['attributes']['data-foo'] = 'bar';
-    $this->assertHTML($field, $static);
-    $this->assertHTML($this->matchControlGroup(), $static);
-  }
-
-  public function testCanReplaceAttributes()
-  {
-    $attributes = array('class' => 'foo', 'data-foo' => 'bar');
-
-    $static = $this->former->text('foo')->require()->replaceAttributes($attributes)->__toString();
-    $matcher = $this->controlGroup('<input class="foo" data-foo="bar" type="text" name="foo" id="foo">');
-
-    $field = $this->matchField();
-    $field['attributes']['class'] = 'foo';
-    $field['attributes']['data-foo'] = 'bar';
-    $this->assertHTML($field, $static);
-    $this->assertHTML($this->matchControlGroup(), $static);
-  }
-
-  public function testCanGetAttribute()
-  {
-    $former = $this->former->span1_text('name')->foo('bar');
-
-    $this->assertEquals('span1', $former->class);
-    $this->assertEquals('bar', $former->foo);
-  }
-
-  public function testCanAddClass()
-  {
-    $matcher = $this->controlGroup('<input class="foo bar" type="text" name="foo" id="foo">');
-    $static = $this->former->text('foo')->class('foo')->addClass('bar')->__toString();
-    $this->assertHTML($this->matchControlGroup(), $static);
-    $this->assertHTML($this->matchField(), $static);
-
-    $this->resetLabels();
-    $input  = $this->former->text('foo', null, null, array('class' => 'foo'))->addClass('bar')->__toString();
-    $this->assertHTML($this->matchControlGroup(), $input);
-    $this->assertHTML($this->matchField(), $input);
-  }
-
-  /**
-   * @dataProvider provideSizes
-   */
-  public function testCanUseMagicMethods($size)
-  {
-    $method = $size.'_text';
-    $class = Str::startsWith($size, 'span') ? $size. ' ' : 'input-'.$size. ' ';
-    $static = $this->former->$method('foo')->addClass('bar')->__toString();
-    if($class == 'input-foo ') $class = null;
-
-    $field = $this->matchField();
-    $field['attributes']['class'] = $class.'bar';
-    $this->assertHTML($this->matchControlGroup(), $static);
-    $this->assertHTML($field, $static);
-  }
-
-  public function testAutomaticLabelsForSingleSelectField()
-  {
-    $field = $this->former->select('foo');
-
-    $matcher = '<div class="control-group"><label for="foo" class="control-label">Foo</label><div class="controls"><select id="foo" name="foo"></select></div></div>';
-
-    $this->assertEquals($matcher, $field->__toString());
-  }
-
-  public function testAutomaticLabelsForMultiSelectField()
-  {
-    $field = $this->former->select('foo[]');
-
-    $matcher = '<div class="control-group"><label for="foo[]" class="control-label">Foo</label><div class="controls"><select id="foo[]" name="foo[]"></select></div></div>';
-
-    $this->assertEquals($matcher, $field->__toString());
-  }
-
-  public function testCantHaveDuplicateIdsForFields()
-  {
-    $field    = $this->former->text('name')->render();
-    $fieldTwo = $this->former->text('name')->render();
-
-    $this->assertEquals('<input id="name" type="text" name="name">', $field);
-    $this->assertEquals('<input id="name-2" type="text" name="name">', $fieldTwo);
-  }
+	////////////////////////////////////////////////////////////////////
+	/////////////////////////// DATA PROVIDERS /////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function provideSizes()
+	{
+		$_sizes = array('mini', 'small', 'medium', 'large', 'xlarge', 'xxlarge', 'span1', 'span6', 'span12', 'foo');
+		foreach ($_sizes as $s) {
+			$sizes[] = array($s);
+		}
+
+		return $sizes;
+	}
+
+	////////////////////////////////////////////////////////////////////
+	//////////////////////////////// TESTS /////////////////////////////
+	////////////////////////////////////////////////////////////////////
+
+	public function testCanCreateFieldsOutsideForms()
+	{
+		$this->former->close();
+		$field = $this->former->text('foo')->raw();
+
+		$this->assertEquals('<input id="foo" type="text" name="foo">', $field->__toString());
+	}
+
+	public function testCanChangeTheFieldIdAndKeepLabelInSync()
+	{
+		$field = $this->former->text('foo');
+		$field->id('bar');
+
+		$matcher = '<div class="control-group"><label for="bar" class="control-label">Foo</label><div class="controls"><input id="bar" type="text" name="foo"></div></div>';
+
+		$this->assertEquals($matcher, $field->__toString());
+	}
+
+	public function testCanChangeTypeMidCourse()
+	{
+		$field = $this->former->text('foo')->setType('email');
+
+		$this->assertEquals('email', $field->getType());
+	}
+
+	public function testCanRenameField()
+	{
+		$input   = $this->former->text('foo')->name('bar')->__toString();
+		$matcher = $this->controlGroup(
+			'<input id="bar" type="text" name="bar">',
+			'<label for="bar" class="control-label">Bar</label>');
+
+		$this->assertEquals($matcher, $input);
+	}
+
+	public function testCanSetValueOnFields()
+	{
+		$matcher = $this->controlGroup('<input id="foo" type="text" name="foo" value="bar">');
+		$static  = $this->former->text('foo')->value('bar')->__toString();
+		$this->assertHTML($this->matchField(), $static);
+		$this->assertHTML($this->matchControlGroup(), $static);
+
+		$this->resetLabels();
+		$input = $this->former->text('foo', null, 'bar')->__toString();
+		$this->assertHTML($this->matchField(), $input);
+		$this->assertHTML($this->matchControlGroup(), $input);
+	}
+
+	public function testCanForceValueOnFields()
+	{
+		$this->former->populate(array('foo' => 'unbar'));
+		$static  = $this->former->text('foo')->forceValue('bar')->__toString();
+		$matcher = $this->controlGroup('<input id="foo" type="text" name="foo" value="bar">');
+
+		$this->assertEquals($matcher, $static);
+	}
+
+	public function testCanCreateViaMagicAttribute()
+	{
+		$static = $this->former->text('foo')->class('foo')->data_bar('bar')->__toString();
+		$this->assertHTML($this->matchField(), $static);
+		$this->assertHTML($this->matchControlGroup(), $static);
+
+		$this->resetLabels();
+		$input = $this->former->text('foo', null, null, array('class' => 'foo', 'data-bar' => 'bar'))->__toString();
+		$this->assertHTML($this->matchField(), $input);
+		$this->assertHTML($this->matchControlGroup(), $input);
+	}
+
+	public function testCanCreateViaMagicAttributeUnvalue()
+	{
+		$static  = $this->former->text('foo')->require()->__toString();
+		$matcher = $this->controlGroup('<input require="true" type="text" name="foo" id="foo">');
+
+		$this->assertHTML($this->matchField(), $static);
+		$this->assertHTML($this->matchControlGroup(), $static);
+	}
+
+	public function testCanSetAttributes()
+	{
+		$attributes = array('class' => 'foo', 'data-foo' => 'bar');
+
+		$static = $this->former->text('foo')->require()->setAttributes($attributes)->__toString();
+
+		$field                           = $this->matchField();
+		$field['attributes']['require']  = 'true';
+		$field['attributes']['class']    = 'foo';
+		$field['attributes']['data-foo'] = 'bar';
+		$this->assertHTML($field, $static);
+		$this->assertHTML($this->matchControlGroup(), $static);
+	}
+
+	public function testCanReplaceAttributes()
+	{
+		$attributes = array('class' => 'foo', 'data-foo' => 'bar');
+
+		$static  = $this->former->text('foo')->require()->replaceAttributes($attributes)->__toString();
+		$matcher = $this->controlGroup('<input class="foo" data-foo="bar" type="text" name="foo" id="foo">');
+
+		$field                           = $this->matchField();
+		$field['attributes']['class']    = 'foo';
+		$field['attributes']['data-foo'] = 'bar';
+		$this->assertHTML($field, $static);
+		$this->assertHTML($this->matchControlGroup(), $static);
+	}
+
+	public function testCanGetAttribute()
+	{
+		$former = $this->former->span1_text('name')->foo('bar');
+
+		$this->assertEquals('span1', $former->class);
+		$this->assertEquals('bar', $former->foo);
+	}
+
+	public function testCanAddClass()
+	{
+		$matcher = $this->controlGroup('<input class="foo bar" type="text" name="foo" id="foo">');
+		$static  = $this->former->text('foo')->class('foo')->addClass('bar')->__toString();
+		$this->assertHTML($this->matchControlGroup(), $static);
+		$this->assertHTML($this->matchField(), $static);
+
+		$this->resetLabels();
+		$input = $this->former->text('foo', null, null, array('class' => 'foo'))->addClass('bar')->__toString();
+		$this->assertHTML($this->matchControlGroup(), $input);
+		$this->assertHTML($this->matchField(), $input);
+	}
+
+	/**
+	 * @dataProvider provideSizes
+	 */
+	public function testCanUseMagicMethods($size)
+	{
+		$method = $size.'_text';
+		$class  = Str::startsWith($size, 'span') ? $size.' ' : 'input-'.$size.' ';
+		$static = $this->former->$method('foo')->addClass('bar')->__toString();
+		if ($class == 'input-foo ') {
+			$class = null;
+		}
+
+		$field                        = $this->matchField();
+		$field['attributes']['class'] = $class.'bar';
+		$this->assertHTML($this->matchControlGroup(), $static);
+		$this->assertHTML($field, $static);
+	}
+
+	public function testAutomaticLabelsForSingleSelectField()
+	{
+		$field = $this->former->select('foo');
+
+		$matcher = '<div class="control-group"><label for="foo" class="control-label">Foo</label><div class="controls"><select id="foo" name="foo"></select></div></div>';
+
+		$this->assertEquals($matcher, $field->__toString());
+	}
+
+	public function testAutomaticLabelsForMultiSelectField()
+	{
+		$field = $this->former->select('foo[]');
+
+		$matcher = '<div class="control-group"><label for="foo[]" class="control-label">Foo</label><div class="controls"><select id="foo[]" name="foo[]"></select></div></div>';
+
+		$this->assertEquals($matcher, $field->__toString());
+	}
+
+	public function testCantHaveDuplicateIdsForFields()
+	{
+		$field    = $this->former->text('name')->render();
+		$fieldTwo = $this->former->text('name')->render();
+
+		$this->assertEquals('<input id="name" type="text" name="name">', $field);
+		$this->assertEquals('<input id="name-2" type="text" name="name">', $fieldTwo);
+	}
 }