diff --git a/render/html/env/viur.py b/render/html/env/viur.py
index 29513db..910fbb9 100644
--- a/render/html/env/viur.py
+++ b/render/html/env/viur.py
@@ -573,6 +573,9 @@ def renderEditForm(render, skel, ignore=None, hide=None):
 			                                 boneWasInvalid = boneWasInvalid,
 			                                 editWidget = editWidget)
 
+		if not categoryContent:
+			continue
+
 		res += sectionTpl.render(categoryName=category,
 		                         categoryClassName = "".join([x for x in category if x in string.ascii_letters]),
 		                         categoryContent = categoryContent,
diff --git a/template/editform_category.html b/template/editform_category.html
index 1b50def..2e5f722 100644
--- a/template/editform_category.html
+++ b/template/editform_category.html
@@ -1,5 +1,6 @@
 <fieldset
 		class="form-group ignt-category"
 		name="{{ categoryName }}">
+		<legend>{{categoryName}}</legend>
     	{{ categoryContent }}
 </fieldset>