diff --git a/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java b/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java
index 3015c33..287f797 100644
--- a/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java
+++ b/app/src/main/java/com/example/vdcscore/ui/home/StandingsAdapter.java
@@ -38,9 +38,29 @@ public class StandingsAdapter extends RecyclerView.Adapter<StandingsAdapter.View
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         Team team = mTeams.get(position);
 
-        holder.textPosition.setText(String.valueOf(position + 1));
+        int rank = position + 1;
+        holder.textPosition.setText(String.valueOf(rank));
+        
+        if (rank >= 1 && rank <= 3) {
+            holder.textPosition.setBackgroundResource(R.drawable.bg_circle_green);
+            holder.textPosition.setTextColor(android.graphics.Color.WHITE);
+        } else if (rank == 4) {
+            holder.textPosition.setBackgroundResource(R.drawable.bg_circle_yellow);
+            holder.textPosition.setTextColor(android.graphics.Color.WHITE);
+        } else if (rank >= 5 && rank <= 6) {
+            holder.textPosition.setBackgroundResource(R.drawable.bg_circle_orange);
+            holder.textPosition.setTextColor(android.graphics.Color.WHITE);
+        } else {
+            holder.textPosition.setBackgroundResource(R.drawable.bg_circle_transparent);
+            holder.textPosition.setTextColor(android.graphics.Color.BLACK);
+        }
+
         holder.textTeamName.setText(team.getName());
         holder.textPlayed.setText(String.valueOf(team.getPlayed()));
+        holder.textWon.setText(String.valueOf(team.getWon()));
+        holder.textDrawn.setText(String.valueOf(team.getDrawn()));
+        holder.textLost.setText(String.valueOf(team.getLost()));
+        holder.textGoalDiff.setText(String.valueOf(team.getGoalDifference()));
         holder.textPoints.setText(String.valueOf(team.getPoints()));
     }
 
@@ -51,15 +71,25 @@ public class StandingsAdapter extends RecyclerView.Adapter<StandingsAdapter.View
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public final TextView textPosition;
+        public final android.widget.ImageView imageLogo;
         public final TextView textTeamName;
         public final TextView textPlayed;
+        public final TextView textWon;
+        public final TextView textDrawn;
+        public final TextView textLost;
+        public final TextView textGoalDiff;
         public final TextView textPoints;
 
         public ViewHolder(View view) {
             super(view);
             textPosition = view.findViewById(R.id.text_position);
+            imageLogo = view.findViewById(R.id.image_logo);
             textTeamName = view.findViewById(R.id.text_team_name);
             textPlayed = view.findViewById(R.id.text_played);
+            textWon = view.findViewById(R.id.text_won);
+            textDrawn = view.findViewById(R.id.text_drawn);
+            textLost = view.findViewById(R.id.text_lost);
+            textGoalDiff = view.findViewById(R.id.text_goal_diff);
             textPoints = view.findViewById(R.id.text_points);
         }
     }
diff --git a/app/src/main/res/drawable/bg_circle_green.xml b/app/src/main/res/drawable/bg_circle_green.xml
new file mode 100644
index 0000000..e103265
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circle_green.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#28a745"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_circle_orange.xml b/app/src/main/res/drawable/bg_circle_orange.xml
new file mode 100644
index 0000000..99d1654
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circle_orange.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#fd7e14"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_circle_transparent.xml b/app/src/main/res/drawable/bg_circle_transparent.xml
new file mode 100644
index 0000000..82a9abb
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circle_transparent.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/transparent"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_circle_yellow.xml b/app/src/main/res/drawable/bg_circle_yellow.xml
new file mode 100644
index 0000000..068ef78
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circle_yellow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#ffc107"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_table_header.xml b/app/src/main/res/drawable/bg_table_header.xml
new file mode 100644
index 0000000..ad242a5
--- /dev/null
+++ b/app/src/main/res/drawable/bg_table_header.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#0a1835"/>
+    <corners
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp"/>
+</shape>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 8864748..d3edfb4 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -18,57 +18,91 @@
         android:textColor="@color/primary_color"
         android:layout_marginBottom="24dp" />
 
-    <!-- Table Header (Clean) -->
+    <!-- Table Header -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingVertical="12dp"
-        android:paddingHorizontal="4dp"
-        android:background="#00000000">
+        android:paddingVertical="8dp"
+        android:paddingHorizontal="8dp"
+        android:background="@drawable/bg_table_header">
 
         <TextView
-            android:layout_width="40dp"
+            android:layout_width="28dp"
             android:layout_height="wrap_content"
-            android:text="#"
-            android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="14sp"/>
+            android:gravity="center"
+            android:text="POS"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
+
+        <Space
+            android:layout_width="28dp"
+            android:layout_height="wrap_content" />
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="Clube"
-            android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="14sp"/>
+            android:text="EQUIPA"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
 
         <TextView
-            android:layout_width="40dp"
+            android:layout_width="24dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="J"
-            android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="14sp"
-            android:tooltipText="Jogos" />
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
 
         <TextView
-            android:layout_width="40dp"
+            android:layout_width="24dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="Pts"
-            android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="14sp"/>
+            android:text="V"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="24dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="E"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="24dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="D"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="26dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="DG"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="PTS"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            android:textStyle="normal" />
     </LinearLayout>
-    
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/divider"
-        android:layout_marginBottom="8dp"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_standings"
diff --git a/app/src/main/res/layout/item_standing.xml b/app/src/main/res/layout/item_standing.xml
index 6896b10..cb1308a 100644
--- a/app/src/main/res/layout/item_standing.xml
+++ b/app/src/main/res/layout/item_standing.xml
@@ -7,19 +7,29 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingVertical="16dp"
-        android:paddingHorizontal="4dp"
+        android:paddingVertical="12dp"
+        android:paddingHorizontal="8dp"
         android:gravity="center_vertical"
         android:background="?attr/selectableItemBackground">
 
         <TextView
             android:id="@+id/text_position"
-            android:layout_width="40dp"
-            android:layout_height="wrap_content"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginHorizontal="2dp"
+            android:gravity="center"
             android:text="1"
+            android:textColor="@color/white"
+            android:textSize="12sp"
             android:textStyle="bold"
-            android:textColor="@color/black"
-            android:textSize="16sp" />
+            android:background="@drawable/bg_circle_green" />
+
+        <ImageView
+            android:id="@+id/image_logo"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginHorizontal="2dp"
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:id="@+id/text_team_name"
@@ -28,27 +38,65 @@
             android:layout_weight="1"
             android:text="Team Name"
             android:textColor="@color/black"
-            android:textSize="16sp"
-            android:textStyle="normal" />
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:ellipsize="end"
+            android:maxLines="1" />
 
         <TextView
             android:id="@+id/text_played"
-            android:layout_width="40dp"
+            android:layout_width="24dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="P"
-            android:textColor="@color/text_secondary"
-            android:textSize="14sp" />
+            android:text="0"
+            android:textColor="@color/text_primary"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/text_won"
+            android:layout_width="24dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="@color/text_primary"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/text_drawn"
+            android:layout_width="24dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="@color/text_primary"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/text_lost"
+            android:layout_width="24dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="@color/text_primary"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/text_goal_diff"
+            android:layout_width="26dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="@color/text_primary"
+            android:textSize="12sp" />
 
         <TextView
             android:id="@+id/text_points"
-            android:layout_width="40dp"
+            android:layout_width="32dp"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="Pts"
+            android:text="0"
             android:textStyle="bold"
             android:textColor="@color/black"
-            android:textSize="14sp" />
+            android:textSize="13sp" />
 
     </LinearLayout>