diff --git a/uni_form/templates/uni_form/field.html b/uni_form/templates/uni_form/field.html
index ed369a4..18e8b7a 100644
--- a/uni_form/templates/uni_form/field.html
+++ b/uni_form/templates/uni_form/field.html
@@ -1,21 +1,33 @@
+{% load uni_form_field %}
 	{% if field.is_hidden %}
         {{ field }}
     {% else %}
-        <div id="div_{{ field.auto_id }}" class="ctrlHolder {% if field.errors %}error{% endif %}">
+        <div id="div_{{ field.auto_id }}" class="ctrlHolder{% if field.errors %} error{% endif %}{% if field|is_checkbox %} checkbox{% endif %}">
+			{% if field|is_checkbox %}
+				{{ field|with_class }}
+				{% if field.label %}
+	                <label for="{{ field.auto_id }}">                    
+	                    {{ field.label }}{% if field.field.required %}*{% endif %}
+	                </label>
+	            {% endif %}		
+			{% else %}
+				{% if field.label %}
+	                <label for="{{ field.auto_id }}">                    
+	                    {{ field.label }}{% if field.field.required %}*{% endif %}
+	                </label>
+	            {% endif %}			
+	            {{ field|with_class }}
+			{% endif %}			
+	
             {% for error in field.errors %}
                 <p id="error_{{ field.auto_id }}" class="errorField">
-                    <strong>{{ error }}</strong>
+                    {{ error }}
                 </p>       
-            {% endfor %} 
-            {% if field.label %}
-                <label for="{{ field.auto_id }}">
-                    {% if field.field.required %}*{% endif %} 
-                    {{ field.label }}
-                </label>
-            {% endif %}
-            {{ field }}
-            {% if field.help_text %}
+            {% endfor %}
+			
+			{% if field.help_text %}
                 <p id="hint_{{ field.auto_id }}" class="formHint">{{ field.help_text }}</p>
-            {% endif %}
+            {% endif %} 
         </div>
-    {% endif %}
\ No newline at end of file
+	{% endif %}
+  
\ No newline at end of file
diff --git a/uni_form/templates/uni_form/whole_uni_form.html b/uni_form/templates/uni_form/whole_uni_form.html
index 94c5268..f5724ae 100644
--- a/uni_form/templates/uni_form/whole_uni_form.html
+++ b/uni_form/templates/uni_form/whole_uni_form.html
@@ -1,10 +1,10 @@
-{% load uni_form %}
+{% load uni_form i18n %}
 
 <form action="" class="uniForm {{ form_class }}" method="post" id="{{ form_id|slugify }}" {% if form.is_multipart %}enctype="multipart/form-data"{% endif %}>
 	{% if form_html %}{{ form_html }}{% else %}
     <fieldset class="inlineLabels">  
-    <legend>* Required fields</legend> 
-    {{ form|as_uni_form }}
+    <legend>* {% trans "Required fields" %}</legend> 
+    	{{ form|as_uni_form }}
     </fieldset>
 	{% endif %}
     {% if inputs %}
diff --git a/uni_form/templatetags/uni_form.py b/uni_form/templatetags/uni_form.py
index 563cdc6..c4b8f46 100644
--- a/uni_form/templatetags/uni_form.py
+++ b/uni_form/templatetags/uni_form.py
@@ -74,6 +74,8 @@ def get_render(self, context):
 
         if helper and helper.layout:
             form_html = helper.render_layout(actual_form)
+        else:
+            form_html = ""
         response_dict = {
                         'form':actual_form,
                         'form_html':form_html,