diff --git a/src/AdminPanel/Twig/Form/date.twig b/src/AdminPanel/Twig/Form/date.twig
deleted file mode 100644
index 5080dd3..0000000
--- a/src/AdminPanel/Twig/Form/date.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<input
-	type="date"
-	name="{{name}}"
-	id="{{name}}"
-	{% if value is not null %}value="{{value|date("Y-m-d")}}"{% endif %}
-	{% for index, item in attr %}{{index}}="{{item}}" {% endfor %}
-/>
diff --git a/src/AdminPanel/Twig/Form/_default.twig b/src/AdminPanel/Twig/form/_default.twig
similarity index 100%
rename from src/AdminPanel/Twig/Form/_default.twig
rename to src/AdminPanel/Twig/form/_default.twig
diff --git a/src/AdminPanel/Twig/Form/choice.twig b/src/AdminPanel/Twig/form/choice.twig
similarity index 90%
rename from src/AdminPanel/Twig/Form/choice.twig
rename to src/AdminPanel/Twig/form/choice.twig
index fa2b401..306627d 100644
--- a/src/AdminPanel/Twig/Form/choice.twig
+++ b/src/AdminPanel/Twig/form/choice.twig
@@ -1,4 +1,4 @@
-{% extends "@AdminPanel/Form/_default.twig" %}
+{% extends "@AdminPanel/form/_default.twig" %}
 
 {% block form %}
 {% if label %}
diff --git a/src/AdminPanel/Twig/form/date.twig b/src/AdminPanel/Twig/form/date.twig
new file mode 100644
index 0000000..73724a5
--- /dev/null
+++ b/src/AdminPanel/Twig/form/date.twig
@@ -0,0 +1,10 @@
+{% extends "@AdminPanel/form/_default.twig" %}
+{% block form %}
+	<input
+		type="date"
+		name="{{name}}"
+		id="{{name}}"
+		{% if value is not null %}value="{{value|date("Y-m-d")}}"{% endif %}
+		{% for index, item in attr %}{{index}}="{{item}}" {% endfor %}
+	/>
+{% endblock %}
diff --git a/src/AdminPanel/Twig/Form/entity.twig b/src/AdminPanel/Twig/form/entity.twig
similarity index 88%
rename from src/AdminPanel/Twig/Form/entity.twig
rename to src/AdminPanel/Twig/form/entity.twig
index 2be793a..77020d3 100644
--- a/src/AdminPanel/Twig/Form/entity.twig
+++ b/src/AdminPanel/Twig/form/entity.twig
@@ -1,4 +1,4 @@
-{% extends "@AdminPanel/Form/_default.twig" %}
+{% extends "@AdminPanel/form/_default.twig" %}
 {% block form %}
 	{% if label %}
 		<label for="{{name}}">{{label}}</label>
diff --git a/src/AdminPanel/Twig/Form/text.twig b/src/AdminPanel/Twig/form/text.twig
similarity index 63%
rename from src/AdminPanel/Twig/Form/text.twig
rename to src/AdminPanel/Twig/form/text.twig
index 8219e3d..f6d8dcb 100644
--- a/src/AdminPanel/Twig/Form/text.twig
+++ b/src/AdminPanel/Twig/form/text.twig
@@ -1,6 +1,9 @@
-{% extends "@AdminPanel/Form/_default.twig" %}
+{% extends "@AdminPanel/form/_default.twig" %}
 
 {% block form %}
-	<label for="{{name}}" />{{label}}</label>
+
+	{% if label %}
+		<label for="{{name}}" />{{label}}</label>
+	{% endif %}
 	<input {% if value is not null %}value="{{value}}"{% endif %} type="text" name="{{name}}" id="{{name}}"&nbsp;{% for index, item in attr %}{{index}}="{{item}}"&nbsp;{% endfor %}/>
 {% endblock %}