diff --git a/src/css/styles.css b/src/css/styles.css
index 9077205..e5ef20b 100644
--- a/src/css/styles.css
+++ b/src/css/styles.css
@@ -240,6 +240,6 @@ main {
 .container .profile-data .events ul li a:hover{
   background-color:hotpink;
   color: #fff;
-  padding: 5px;
+  padding: 3px;
   border-radius: 7px;
 }
\ No newline at end of file
diff --git a/src/scripts/objects/screen.js b/src/scripts/objects/screen.js
index b02b776..0a7e8e1 100644
--- a/src/scripts/objects/screen.js
+++ b/src/scripts/objects/screen.js
@@ -36,10 +36,10 @@ const screen = {
                                                                         <a href="${repo.html_url}" target = "_blank">${repo.name}</a>
 
                                                                         <div class="repo-info">
-                                                                            <p>🍴 ${repo.forks_count}</p>
-                                                                            <p>🌟 ${repo.stargazers_count}</p>
-                                                                            <p>👀 ${repo.watchers_count}</p>
-                                                                            <p>💻 ${repo.language}</p>                                                                                                                                    
+                                                                            <p>🍴 ${repo.forks_count ?? "Sem forks 😢"}</p>
+                                                                            <p>🌟 ${repo.stargazers_count ?? "Sem estrelas 😢"}</p>
+                                                                            <p>👀 ${repo.watchers_count ?? "Sem observadores 😢"}</p>
+                                                                            <p>💻 ${repo.language ?? "Sem linguagem 😢"}</p>                                                                                                                                    
                                                                         </div>
 
                                                                     </div>
@@ -58,18 +58,20 @@ const screen = {
 
         let eventsItens = ""
 
-        user.events.filter(event => event.type === "CreateEvent" || event.type === "PushEvent").forEach(event => {
-
-            if (event.type === "PushEvent"){
-                eventsItens += `<li> <a href="https://github.com/${event.repo.name}" target="_blank"> ${event.repo.name}</a> - ${event.payload.commits.slice(-1)[0].message} </li>`;
-                console.log(eventsItens);
+        user.events.forEach(event =>{
+            if(event.type === "PushEvent"){
+                eventsItens += `<li>
+                                    <a href="https://github.com/${event.repo.name}" target="_blank">${event.repo.name}</a>
+                                    <p> -- ${event.payload.commits[0].message}</p>
+                                </li>`
             }
-
-            else if (event.type === "CreateEvent"){
-                eventsItens += `<li> Create ${event.payload.ref_type} (Sem mensagem de commit!) </li>`;
+            else{
+                eventsItens += `<li>
+                                    <a href="https://github.com/${event.repo.name}" target="_blank">${event.repo.name}</a>
+                                    <p> -- Criado um ${event.payload.ref_type}</p>
+                                </li>`
             }
-
-        });
+        })
 
         if (eventsItens){
             this.userProfile.innerHTML += ` <div class="events section">
diff --git a/src/scripts/services/events.js b/src/scripts/services/events.js
index 09c475e..4b5adad 100644
--- a/src/scripts/services/events.js
+++ b/src/scripts/services/events.js
@@ -4,7 +4,8 @@ import { baseUrl, eventsQuantity } from "../variables.js";
 
 async function getEvents(userName){
     const response = await fetch(`${baseUrl}/${userName}/events?per_page=${eventsQuantity}`);
-    return await response.json();
+    const events = await response.json();
+    return events.filter(element => element.type === "CreateEvent" || element.type === "PushEvent").slice(0,eventsQuantity);
 }
 
 export { getEvents };
\ No newline at end of file
diff --git a/src/scripts/variables.js b/src/scripts/variables.js
index 7d457ac..adade29 100644
--- a/src/scripts/variables.js
+++ b/src/scripts/variables.js
@@ -1,5 +1,5 @@
 const baseUrl = "https://api.github.com/users";
-const repositoriesQuantity = 16;
-const eventsQuantity = 16;
+const repositoriesQuantity = 24;
+const eventsQuantity = 24;
 
 export {baseUrl, repositoriesQuantity, eventsQuantity};
\ No newline at end of file