diff --git a/config.toml b/config.toml
index a2260c0..6293490 100644
--- a/config.toml
+++ b/config.toml
@@ -37,16 +37,24 @@ theme = "sada"
         [[params.education.list]]
         degree = "Bachelors of Computer Science"
         college = "California State University of Monterey Bay"
-        dates = "2018 - 2019(December)"
+        dates = "Fall 2018 - Winter 2019"
+        grad = "yes"
 
         [[params.education.list]]
         college = "Irvine Valley College"
-        dates = "2016 - 2018"
+        dates = "Fall 2016 - Spring 2018"
+        degree = "Tranfer Credits for CSU"
+
+        [[params.education.list]]
+        college = "California State University of Fullerton"
+        dates = "Fall 2015 - Spring 2016"
+        degree = "Credits for CSU"
 
         [[params.education.list]]
         degree = "High School Diploma"
         college = "Aliso Niguel High School"
-        dates = "2011 - 2015"
+        dates = "Fall 2011 - Spring 2015"
+        grad = "yes"
 
     # Languages section
     [params.language]
diff --git a/layouts/partials/education.html b/layouts/partials/education.html
new file mode 100644
index 0000000..425ef4e
--- /dev/null
+++ b/layouts/partials/education.html
@@ -0,0 +1,16 @@
+<h3>
+    <i class="fas fa-book"></i>
+    {{ .Site.Params.education.title }}
+{{ range .Site.Params.education.list }}
+</h3>
+<dl>
+    <dt>
+        {{ .degree }}
+    {{ if eq .grad "yes" }}
+        <i class="fas fa-graduation-cap"></i> 
+    {{ end }}
+    </dt>
+    <dd class="mb-0 ml-3">{{ .college }}</dd>
+    <dd class="mb-0 ml-3">{{ .dates }}</dd>
+</dl>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/language.html b/layouts/partials/language.html
index 54b271d..cf1b650 100644
--- a/layouts/partials/language.html
+++ b/layouts/partials/language.html
@@ -1,5 +1,8 @@
 
-<h3>{{ .Site.Params.language.title }}</h3>
+<h3>
+  <i class="fas {{ .Site.Params.skills.icon }}"></i>
+  {{ .Site.Params.language.title }}
+</h3>
 <ul class="list-unstyled" style="text-indent: 1.25em;">
     {{ range .Site.Params.language.list }}
     <div class="skill-type">{{ .type }}</div>