diff --git a/_data/navigation.yml b/_data/navigation.yml
index 377f53b441f05..e5422a912ac16 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -1,19 +1,32 @@
 # main links links
 main:
-  - title: "Publications"
-    url: /publications/
 
-#  - title: "Talks"
-#    url: /talks/
+  - title: "CV"
+    url: /cv/
+
+  - title: "Teaching"
+    url: /teaching/
+
+  - title: "Students/Supervision"
+    url: /students/
 
   - title: "Research"
     url: /research/
 
-  - title: "Students"
-    url: /students/
+  - title: "Software"
+    url: /Software/
 
-  - title: "Teaching"
-    url: /teaching/
+  - title: "Publications"
+    url: /publications/
+
+  - title: "Talks"
+    url: /talks/
+
+  - title: "Links"
+    url: /Links/
+
+#  - title: "Talks"
+#    url: /talks/
 
 #  - title: "Portfolio"
 #    url: /portfolio/
@@ -21,8 +34,5 @@ main:
 #  - title: "Blog Posts"
 #    url: /year-archive/
 
-#  - title: "CV"
-#    url: /cv/
-
 # - title: "Guide"
 #    url: /markdown/
diff --git a/_pages/cv.md b/_pages/cv.md
index bf19ffd80b475..2431f946f7699 100644
--- a/_pages/cv.md
+++ b/_pages/cv.md
@@ -11,10 +11,12 @@ redirect_from:
 
 Education
 ======
-* B.S. in Github, Github University, 2012
-* M.S. in Jekyll, Github University, 2014
-* Ph.D in Version Control Theory, Github University, 2018 (expected)
+* Electrical Engineering Degree, Universidad de San Carlos de Guatemala, Spring 2005.
+* Visiting Researcher, The University of Glasgow, Fall 2005.
+* MSc in Electric Power Engineering, Rensselaer Polytechnic Institute, 2007. Major: Electric Power. Minor: Control Systems.
+* Ph.D in Electric Power Engineering, Rensselaer Polytechnic Institute, 2007.
 
+<!---
 Work experience
 ======
 * Summer 2015: Research Assistant
@@ -26,8 +28,8 @@ Work experience
   * Github University
   * Duties included: Merging pull requests
   * Supervisor: Professor Hub
-  
-Skills
+--->
+<!---Skills
 ======
 * Skill 1
 * Skill 2
@@ -35,25 +37,28 @@ Skills
   * Sub-skill 2.2
   * Sub-skill 2.3
 * Skill 3
+--->
 
 Publications
 ======
   <ul>{% for post in site.publications %}
     {% include archive-single-cv.html %}
   {% endfor %}</ul>
-  
+
 Talks
 ======
   <ul>{% for post in site.talks %}
     {% include archive-single-talk-cv.html %}
   {% endfor %}</ul>
-  
+
 Teaching
 ======
   <ul>{% for post in site.teaching %}
     {% include archive-single-cv.html %}
   {% endfor %}</ul>
-  
+
+<!---
 Service and leadership
 ======
-* Currently signed in to 43 different slack teams
+* Item
+--->
diff --git a/_pages/research.md b/_pages/research.md
index f6c84910a633a..809b2c21a3f2b 100644
--- a/_pages/research.md
+++ b/_pages/research.md
@@ -7,6 +7,7 @@ redirect_from:
   - /resume
 ---
 {% include base_path %}
+
 # Research Areas
 * Modeling and Simulation
 * Stability, Control and Security of Power Systems
diff --git a/_pages/software.md b/_pages/software.md
new file mode 100644
index 0000000000000..c0d70ba103dbe
--- /dev/null
+++ b/_pages/software.md
@@ -0,0 +1,12 @@
+---
+layout: archive
+title: "Software"
+permalink: /software/
+author_profile: true
+redirect_from:
+  - /resume
+---
+{% include base_path %}
+
+# Software Projects and Resources
+* ALSETLab Github repository: [https://github.com/ALSETLab](https://github.com/ALSETLab)
diff --git a/_pages/students.md b/_pages/students.md
index bf19ffd80b475..97eff4756ced9 100644
--- a/_pages/students.md
+++ b/_pages/students.md
@@ -9,51 +9,24 @@ redirect_from:
 
 {% include base_path %}
 
-Education
-======
-* B.S. in Github, Github University, 2012
-* M.S. in Jekyll, Github University, 2014
-* Ph.D in Version Control Theory, Github University, 2018 (expected)
+# News:
+* Looking for MSc/PhD students to join ALSETLab during Spring and Fall 2018.
+* Funded positions for 4 students.
+* More information to come.
 
-Work experience
-======
-* Summer 2015: Research Assistant
-  * Github University
-  * Duties included: Tagging issues
-  * Supervisor: Professor Git
+# Prospective Students: Do you want to work in my team - ALSETLab?
 
-* Fall 2015: Research Assistant
-  * Github University
-  * Duties included: Merging pull requests
-  * Supervisor: Professor Hub
-  
-Skills
-======
-* Skill 1
-* Skill 2
-  * Sub-skill 2.1
-  * Sub-skill 2.2
-  * Sub-skill 2.3
-* Skill 3
+## Requirements
+## Study for the tests!
+## Apply for Admission
 
-Publications
-======
-  <ul>{% for post in site.publications %}
-    {% include archive-single-cv.html %}
-  {% endfor %}</ul>
-  
-Talks
-======
-  <ul>{% for post in site.talks %}
-    {% include archive-single-talk-cv.html %}
-  {% endfor %}</ul>
-  
-Teaching
-======
-  <ul>{% for post in site.teaching %}
-    {% include archive-single-cv.html %}
-  {% endfor %}</ul>
-  
-Service and leadership
-======
-* Currently signed in to 43 different slack teams
+# Current Students
+## BSc Students
+## PhD Students
+
+
+# Former Students
+## Post-Docs
+## PhD Students
+## MSc Students
+## BSc Students