diff --git a/windows/index.md b/windows/index.md
index dad59e644a..50d0140341 100644
--- a/windows/index.md
+++ b/windows/index.md
@@ -12,30 +12,30 @@ author: brianlic-msft
 This library provides the core content that IT pros need to evaluate, plan, deploy, secure and manage devices running Windows 10 or Windows 10 Mobile.
 
 <center><iframe src="https://channel9.msdn.com/Events/Ignite/Australia-2017/WIN212/player" width="960" height="540" allowFullScreen frameBorder="0"></iframe></center>
-
+
 <table border="0" width="100%" align='center'>
 </tr>
   <tr style="text-align:center;">
     <td style="width:25%; border:0;">
-      <a href="https://technet.microsoft.com/en-us/itpro/windows/whats-new/index">
-        <img src="images/w10-whatsnew-highlight.png" alt="Read what's new in Windows 10" title="What's new in Windows 10?" />
+      <a href="https://technet.microsoft.com/itpro/windows/whats-new/index">
+        <img src="images/w10-whatsnew-highlight.png" alt="Read what's new in Windows 10" title="What's new in Windows 10?" />
       </a>
       <br/>What's New?
     </td>
     <td style="width:25%; border:0;">
-      <a href="https://technet.microsoft.com/en-us/itpro/windows/plan/index">
+      <a href="https://technet.microsoft.com/itpro/windows/plan/index">
         <img src="images/w10-plan.png" alt="Plan your Windows 10 enterprise deployment" title="Plan your Windows 10 enterprise deployment" />
       </a>
       <br/>Plan
     </td>
     <td style="width:25%; border:0;">
-      <a href="https://technet.microsoft.com/en-us/itpro/windows/deploy/index">
+      <a href="https://technet.microsoft.com/itpro/windows/deploy/index">
         <img src="images/w10-deploy.png" alt="Deploy Windows 10 in your enterprise" title="Deploy Windows 10" />
       </a>
       <br/>Deploy
     </td>
     <td style="width:25%; border:0;">
-      <a href="https://technet.microsoft.com/en-us/itpro/windows/manage/index">
+      <a href="https://technet.microsoft.com/itpro/windows/manage/index">
         <img src="images/w10-manage.png" alt="Manage Windows 10 in your enterprise" title="Manage Windows 10" />
       </a>
       <br/>Manage
@@ -44,47 +44,47 @@ This library provides the core content that IT pros need to evaluate, plan, depl
   <tr style="text-align:center;">
     <td style="width:25%; border:0;">
     <br/>
-      <a href="https://technet.microsoft.com/en-us/itpro/windows/keep-secure/index">
+      <a href="https://technet.microsoft.com/itpro/windows/keep-secure/index">
         <img src="images/w10-secure.png" alt="Keep Windows 10 secure" title="Keep Windows 10 secure" />
       </a>
       <br/>Keep Secure
     </td>
     <td style="width:25%; border:0;">
       <br/>
-      <a href="https://technet.microsoft.com/en-us/itpro/windows/configure/index">
+      <a href="https://technet.microsoft.com/itpro/windows/configure/index">
         <img src="images/W10-configure.png" alt="Configure Windows 10 in your enterprise" title="Configure Windows 10" />
       </a>
       <br/>Configure
     </td>
     <td style="width:25%; border:0;">
       <br/>
-      <a href="https://technet.microsoft.com/en-us/itpro/windows/update/index">
+      <a href="https://technet.microsoft.com/itpro/windows/update/index">
         <img src="images/w10-update.png" alt="Update Windows 10 in your enterprise" title="Update Windows 10" />
       </a>
       <br/>Update
     </td>
     <td style="width:25%; border:0;">
       <br/>
-      <a href="">
-        <img src="images/w10-evaluation.png" alt="Try Windows 10" title="Try Windows 10" />
+      <a href="https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise">
+        <img src="images/w10-evaluation.png" alt="Try Windows 10" title="Try Windows 10" />
       </a>
       <br/>Try it
     </td>
   </tr>
-</table>
+</table>
 
-## Get to know Windows as a Service (WaaS)
-<table border="0" width="100%" align='center'>
+## Get to know Windows as a Service (WaaS)
+<table border="0" width="100%" align='center'>
 <tr>
-  <td valign=top width:40%; border:0;>The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers.
+  <td valign=top width:40%; border:0;>The Windows 10 operating system introduces a new way to build, deploy, and service Windows: Windows as a service. Microsoft has reimagined each part of the process, to simplify the lives of IT pros and maintain a consistent Windows 10 experience for its customers.
 
-  These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time.
-  - <a href='https://technet.microsoft.com/en-us/itpro/windows/manage/waas-overview'>Read more about Windows as a Service</a>
-
-  - <a href=''>Download the WaaS infographic</a>
+  These improvements focus on maximizing customer involvement in Windows development, simplifying the deployment and servicing of Windows client computers, and leveling out the resources needed to deploy and maintain Windows over time.
+  - [Read more about Windows as a Service](manage/waas-overview.md)
+
+  - <a href=''>Download the WaaS infographic</a>
 
   </td>
-  <td valign=top width:60%; border:0;><center><img style='border:thin silver solid' src="images/w10-WaaS-poster.png" alt="Get to know Windows as a Service (WaaS) " title="Get to know Windows as a Service (WaaS)" /></center></td>
+  <td valign=top width:60%; border:0;><center><img style='border:thin silver solid' src="images/w10-WaaS-poster.png" alt="Get to know Windows as a Service (WaaS) " title="Get to know Windows as a Service (WaaS)" /></center></td>
 </tr>
 <table>