diff --git a/src/main/java/br/ufrn/dct/apf/controller/DataFunctionController.java b/src/main/java/br/ufrn/dct/apf/controller/DataFunctionController.java
index 1fbbf56..12eeb79 100644
--- a/src/main/java/br/ufrn/dct/apf/controller/DataFunctionController.java
+++ b/src/main/java/br/ufrn/dct/apf/controller/DataFunctionController.java
@@ -1,12 +1,12 @@
 package br.ufrn.dct.apf.controller;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.validation.Valid;
-
+import br.ufrn.dct.apf.dto.DataFunctionDTO;
 import br.ufrn.dct.apf.model.DataFunction;
+import br.ufrn.dct.apf.model.Project;
+import br.ufrn.dct.apf.model.User;
+import br.ufrn.dct.apf.model.UserStory;
+import br.ufrn.dct.apf.service.DataFunctionService;
+import br.ufrn.dct.apf.service.ProjectService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +16,11 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
-import br.ufrn.dct.apf.dto.DataFunctionDTO;
-import br.ufrn.dct.apf.model.Project;
-import br.ufrn.dct.apf.model.User;
-import br.ufrn.dct.apf.model.UserStory;
-import br.ufrn.dct.apf.service.DataFunctionService;
-import br.ufrn.dct.apf.service.ProjectService;
+
+import javax.validation.Valid;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Controller
 public class DataFunctionController extends AbstractController {
@@ -78,15 +77,21 @@ public ModelAndView add(DataFunctionDTO df) {
         return mv;
     }
 
-//    @GetMapping("/df/list")
-//    public ModelAndView list() {
+//    @GetMapping("/df/list/{projectId}")
+//    public ModelAndView list(@PathVariable("projectId") Long projectId) throws BusinessRuleException {
 //        ModelAndView mv = new ModelAndView("df/list");
 //
-//        User current = getCurrentUser();
+//        User currentUser = getCurrentUser();
+//        Project project = projectService.findOne(projectId);
+//
+//        if (!project.isMemberOfProject(currentUser)) {
+//            throw MEMBER_NOT_EXISTS;
+//        }
 //
-//        List<Project> projects = projectService.findByUserId(current.getId());
+//        List<DataFunction> dfs = dataFunctionService.findByProject(projectId);
 //
-//        mv.addObject("projects", projects);
+//        mv.addObject("project", project);
+//        mv.addObject("dfs", dfs);
 //
 //        return mv;
 //    }
@@ -126,17 +131,4 @@ public ModelAndView details(@PathVariable("dataFunctionId") Long id) {
 
         return mv;
     }
-
-    // Consultar se precisa ser por projeto ou time a busca
-    @GetMapping("/df/list")
-    public ModelAndView list() {
-        ModelAndView mv = new ModelAndView("df/list");
-
-        List<DataFunction> dfs = dataFunctionService.findAll();
-
-        mv.addObject("dfs", dfs);
-
-        return mv;
-    }
-
 }
diff --git a/src/main/java/br/ufrn/dct/apf/repository/DataFunctionRepository.java b/src/main/java/br/ufrn/dct/apf/repository/DataFunctionRepository.java
index 6f136cc..4218166 100644
--- a/src/main/java/br/ufrn/dct/apf/repository/DataFunctionRepository.java
+++ b/src/main/java/br/ufrn/dct/apf/repository/DataFunctionRepository.java
@@ -1,11 +1,13 @@
 package br.ufrn.dct.apf.repository;
 
+import br.ufrn.dct.apf.model.DataFunction;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import br.ufrn.dct.apf.model.DataFunction;
+import java.util.List;
 
 @Repository("dataFunctionRepository")
 public interface DataFunctionRepository extends JpaRepository<DataFunction, Long> {
 
+    List<DataFunction> findByProject(Long projectId);
 }
diff --git a/src/main/java/br/ufrn/dct/apf/service/DataFunctionService.java b/src/main/java/br/ufrn/dct/apf/service/DataFunctionService.java
index ea54e17..255250f 100644
--- a/src/main/java/br/ufrn/dct/apf/service/DataFunctionService.java
+++ b/src/main/java/br/ufrn/dct/apf/service/DataFunctionService.java
@@ -64,4 +64,8 @@ private DataFunctionDTO createDTO(DataFunction df) {
     public void delete(Long id) {
         dataFunctionRepository.deleteById(id);
     }
+
+    public List<DataFunction> findByProject(Long projectId) {
+        return dataFunctionRepository.findByProject(projectId);
+    }
 }
diff --git a/src/main/resources/templates/df/list.html b/src/main/resources/templates/df/list.html
deleted file mode 100644
index 0ae06d4..0000000
--- a/src/main/resources/templates/df/list.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html lang="pt" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
-<head>
-  <meta charset="UTF-8">
-  <title>Data Functions</title>
-
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <meta name="viewport" content="width=device-width"/>
-  <link rel="stylesheet" type="text/css" th:href="@{/css/simple-sidebar.css}"/>
-
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-</head>
-<body>
-<div th:replace="fragments/header :: header"></div>
-
-<div class="modal modal-delete" tabindex="-1" role="dialog">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Deletar Registro</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <p id="texto-modal"></p>
-      </div>
-      <div class="modal-footer">
-        <a id="link-delete">
-          <button type="button" class="btn btn-danger">Sim, quero deletar</button>
-        </a>
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div id="wrapper" class="wrapper.toggled toggled" style="margin-top: 50px">
-  <!-- Sidebar -->
-  <div th:replace="fragments/menu"></div>
-  <!-- /#sidebar-wrapper -->
-
-  <!-- Page Content -->
-  <div id="page-content-wrapper">
-    <div class="container-fluid">
-
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <strong>Data Functions</strong>
-        </div>
-        <div class="panel-body">
-          <div class="table-responsive">
-            <table class="table table-sm table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th>ID</th>
-                <th>Nome</th>
-                <th>Descrição</th>
-                <th></th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr th:each="df : ${dfs}" th:attr="onclick=|viewDetailsDf('${df.id}')|">
-                <td th:text="${df.id}"></td>
-                <td th:text="${df.name}"></td>
-                <td th:text="${df.description}"></td>
-                <td>
-                  <div class="btn-group pull-right">
-                    <a th:href="@{/df/edit/{id}(id=${df.id})}" class="btn btn-sm btn-primary">Editar</a>
-<!--                    <a th:id="${df.id}" class="delete btn btn-sm btn-danger confirModal">Excluir</a>-->
-                  </div>
-                </td>
-              </tr>${df.id}
-              </tbody>
-            </table>
-          </div>
-        </div>
-
-        <div class="panel-footer">
-          <a class="btn btn-sm btn-success"
-             th:href="@{/project/add/}">Add Data Function</a>
-        </div>
-      </div>
-    </div>
-    <!-- /#page-content-wrapper -->
-    <div th:include="fragments/footer :: footer-authenticated" align="center"></div>
-  </div>
-</div>
-
-<script type="text/javascript">
-  function viewDetailsDf(id) {
-    window.location = `details/${id}`;
-  }
-</script>
-</body>
-</html>
diff --git a/src/main/resources/templates/project/view.html b/src/main/resources/templates/project/view.html
index c217409..bdc30e7 100644
--- a/src/main/resources/templates/project/view.html
+++ b/src/main/resources/templates/project/view.html
@@ -83,6 +83,7 @@
                     </td>
                     <td>
                       <div class="btn-group pull-right">
+                        <a class="btn btn-sm btn-primary" th:href="@{/df/details/{id}(id=${dataFunction.id})}">Detalhes</a>
                         <a class="btn btn-sm btn-primary" th:href="@{/df/edit/{id}(id=${dataFunction.id})}">Editar</a>
                         <a class="delete btn btn-sm btn-danger" th:href="@{/df/delete/{id}(id=${dataFunction.id})}">Excluir</a>
                       </div>
@@ -121,8 +122,7 @@
                     <td>
                       <div class="btn-group pull-right">
                         <a class="btn btn-sm btn-primary" th:href="@{/us/edit/{id}(id=${userstory.id})}">Editar</a>
-                        <a class="delete btn btn-sm btn-danger"
-                           th:href="@{/us/delete/{id}(id=${userstory.id})}">Excluir</a>
+                        <a class="delete btn btn-sm btn-danger" th:href="@{/us/delete/{id}(id=${userstory.id})}">Excluir</a>
                       </div>
                     </td>
                   </tr>
@@ -179,5 +179,10 @@
     <div th:include="fragments/footer :: footer-authenticated" align="center"></div>
   </div>
 </div>
+<script type="text/javascript">
+  function viewDetailsDf(id) {
+    window.location = `details/${id}`;
+  }
+</script>
 </body>
 </html>