diff --git a/_config.yml b/_config.yml
index c8ad2ab4d02665d768c7b355bf27f34251ffd011..f771e35c1bfab32e7935b348280dcca1fc362e38 100644
--- a/_config.yml
+++ b/_config.yml
@@ -29,6 +29,7 @@ author:
   email:             kohlhase@kwarc.info
 
 semester: SS17
+upcoming: WS17/18
 
 # Custom vars
 version:             0.3.0
@@ -86,6 +87,8 @@ menu:
             url: '/courses/'
           - title: 'Former Courses'
             url: '/courses/former/'
+          - title: 'Upcoming Courses'
+            url: '/courses/upcoming/'
     
     - title: 'Contact'
       url: '/contact/'
@@ -122,4 +125,4 @@ defaults:
     values:
       menu_hidden: false
       menu_order: 100
-      external: false
\ No newline at end of file
+      external: false
diff --git a/courses/ai1.md b/courses/ai1.md
index cfaa4047c3db959466ad14dfdb90fab31f64b4dd..dd32ee690a1078dd12a753c44567550a50d405dd 100644
--- a/courses/ai1.md
+++ b/courses/ai1.md
@@ -6,6 +6,7 @@ instructor: mkohlhase
 
 semesters:
     - WS16/17
+    - WS17/18
 ---
 
 Diese Vorlesung beschäftigt sich mit den Grundlagen der Künstlichen Intelligenz (KI),
diff --git a/systems/mws.md b/systems/mws.md
index cac65794816b24e605031907e0f6edb8acd578a4..31ebe817767e7942b3e0a0dc0d9ee238302871bb 100644
--- a/systems/mws.md
+++ b/systems/mws.md
@@ -2,7 +2,8 @@
 layout: system
 
 menu_title: MathWebSearch
-title: "MathWebSearch a Mathematical Search Engine"
+title: MathWebSearch"
+teaser: A Mathematical Search Engine
 
 start_date: '2005'