diff --git a/multigranja/apps/entities/templates/paddock/paddock_create.html b/multigranja/apps/entities/templates/paddock/paddock_create.html
index 25902fa..5c01be8 100644
--- a/multigranja/apps/entities/templates/paddock/paddock_create.html
+++ b/multigranja/apps/entities/templates/paddock/paddock_create.html
@@ -7,4 +7,5 @@
 
 {% block content %}
     New - Paddock
+    {% include 'includes/_form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/multigranja/apps/entities/templates/paddock/paddock_update.html b/multigranja/apps/entities/templates/paddock/paddock_update.html
index 4feb2cf..c03627f 100644
--- a/multigranja/apps/entities/templates/paddock/paddock_update.html
+++ b/multigranja/apps/entities/templates/paddock/paddock_update.html
@@ -6,5 +6,6 @@
 {% endblock %}
 
 {% block content %}
-    Delete - Paddock
+    Edit - Paddock
+    {% include 'includes/_form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/multigranja/apps/entities/templates/paddock_group/paddock_group_create.html b/multigranja/apps/entities/templates/paddock_group/paddock_group_create.html
index 18c2b3f..374fefa 100644
--- a/multigranja/apps/entities/templates/paddock_group/paddock_group_create.html
+++ b/multigranja/apps/entities/templates/paddock_group/paddock_group_create.html
@@ -7,4 +7,5 @@
 
 {% block content %}
     New - Paddock Group
+    {% include 'includes/_form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/multigranja/apps/entities/templates/paddock_group/paddock_group_update.html b/multigranja/apps/entities/templates/paddock_group/paddock_group_update.html
index f3de954..e9bee4a 100644
--- a/multigranja/apps/entities/templates/paddock_group/paddock_group_update.html
+++ b/multigranja/apps/entities/templates/paddock_group/paddock_group_update.html
@@ -7,4 +7,5 @@
 
 {% block content %}
     Delete - Paddock Group
+    {% include 'includes/_form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/multigranja/apps/entities/templates/rotation/rotation_create.html b/multigranja/apps/entities/templates/rotation/rotation_create.html
index 63f4915..859b5f3 100644
--- a/multigranja/apps/entities/templates/rotation/rotation_create.html
+++ b/multigranja/apps/entities/templates/rotation/rotation_create.html
@@ -7,4 +7,5 @@
 
 {% block content %}
     New - Rotation
+    {% include 'includes/_form.html' %}
 {% endblock %}
\ No newline at end of file
diff --git a/multigranja/apps/entities/templates/rotation/rotation_update.html b/multigranja/apps/entities/templates/rotation/rotation_update.html
deleted file mode 100644
index 1875fc9..0000000
--- a/multigranja/apps/entities/templates/rotation/rotation_update.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends 'base_modal.html' %}
-{% load static %}
-
-{% block extra_css %}
-    <link rel="stylesheet" href="{% static 'farm/css/home.css' %}"> 
-{% endblock %}
-
-{% block content %}
-    Delete - Rotation
-{% endblock %}
\ No newline at end of file