diff --git a/Calendar/MonthOvPanel.py b/Calendar/MonthOvPanel.py
index 2b65909..d6b7216 100644
--- a/Calendar/MonthOvPanel.py
+++ b/Calendar/MonthOvPanel.py
@@ -9,14 +9,17 @@ from TextDesign import TextDesign
 
 weatherheadersize = (1,0.113)
 seperatorplace = (0, 0.113)
-monthplace = (0, 0.116)
-weekplace = (0, 0.209)
+monthplace = (0, 0.11)
 monthboxsize = (1, 0.085)
 daynumberboxsize = (0.143, 0.143)
-daynumbersize = 28
+daynumbersize = 25
 monthtextsize = 40
 monthovposition = (0, 0.225)
 monthovsize = (1, 0.5)
+weekdayrowpos = (0, 0.209)
+weekhighlightboxsize = (0.143, 0.044)
+weekrowboxsize = (1, 0.044)
+weekdaytextsize = 28
 
 class MonthOvPanel (PanelDesign):
     """Overview that focuses on the current month and
@@ -26,26 +29,10 @@ class MonthOvPanel (PanelDesign):
         self.__first_render__()
 
     def __first_render__ (self):
-        time = datetime.now()
-
         self.__draw_month_name__()
         self.__draw_seperator__()
-        """Draw the icons with the weekday-names (Mon, Tue...) and
-            draw a circle  on the current weekday"""
-        #if (week_starts_on == "Monday"):
-        #    calendar.setfirstweekday(calendar.MONDAY)
-        #    self.draw(weekmon, self.__abs_pos__(weekplace))
-        #    self.draw_bitmap(weekday, weekdaysmon[(time.strftime("%a"))])
-        #elif (week_starts_on == "Sunday"):
-        #    calendar.setfirstweekday(calendar.SUNDAY)
-        #    self.draw(weeksun, self.__abs_pos__(weekplace))
-        #    self.draw_bitmap(weekday, weekdayssun[(time.strftime("%a"))])
-        """Using the built-in calendar function, draw icons for each
-            number of the month (1,2,3,...28,29,30)"""
-        cal = calendar.monthcalendar(time.year, time.month)
-        for week in cal:
-            for numbers in week:
-                self.__draw_day_number__(numbers, self.__get_day_pos__(cal.index(week), week.index(numbers)))
+        self.__draw_month_overview__()
+        self.__draw_week_row__()
     
     def add_weather (self, weather):
         self.draw_design(WeatherHeaderDesign(self.__abs_pos__(weatherheadersize), weather))
@@ -56,8 +43,10 @@ class MonthOvPanel (PanelDesign):
     def add_rssfeed (self, rss):
         raise NotImplementedError("Functions needs to be implemented")
 
-    def __abs_pos__(self, pos):
-        return (int(pos[0] * self.size[0]), int(pos[1] * self.size[1]))
+    def __abs_pos__(self, pos, size=None):
+        if size is None:
+            size = self.size
+        return (int(pos[0] * size[0]), int(pos[1] * size[1]))
 
     def __draw_seperator__(self):
         """Draw a line seperating the weather and Calendar section"""
@@ -82,4 +71,43 @@ class MonthOvPanel (PanelDesign):
         partialwidth = maxwidth / 7
         partialheight = maxheight / 5
         posx, posy = self.__abs_pos__(monthovposition)
-        return (posx + day_of_week * partialwidth, posy + week_in_month * partialheight)
\ No newline at end of file
+        return (posx + day_of_week * partialwidth, posy + week_in_month * partialheight)
+
+    def __draw_month_overview__ (self):
+        """Using the built-in calendar function, draw icons for each
+            number of the month (1,2,3,...28,29,30)"""
+        cal = calendar.monthcalendar(datetime.now().year, datetime.now().month)
+        for week in cal:
+            for numbers in week:
+                self.__draw_day_number__(numbers, self.__get_day_pos__(cal.index(week), week.index(numbers)))
+
+    def __draw_week_row__ (self):
+        if (week_starts_on == "Monday"):
+            calendar.setfirstweekday(calendar.MONDAY)
+        elif (week_starts_on == "Sunday"):
+            calendar.setfirstweekday(calendar.SUNDAY)
+
+        week_days = []
+
+        for day in week_days:
+            txt = TextDesign(self.__abs_pos__(daynumberboxsize), fontsize=weekdaytextsize, text=str(day), verticalalignment="center", horizontalalignment="center")
+            txt.pos = self.__get_week_day_pos__(week_days.index(day))
+            self.draw_design(txt)
+        
+        self.__draw_highlight_box__(self.__abs_pos__(weekhighlightboxsize), self.__get_week_day_pos__(datetime.now().weekday()))
+
+    def __get_week_day_pos__(self, day_of_week):
+        maxwidth, _ = self.__abs_pos__(monthovsize)
+        partialwidth = maxwidth / 7
+        posx, posy = self.__abs_pos__(weekdayrowpos)
+        return (posx + day_of_week * partialwidth, posy)
+
+    def __draw_highlight_box__(self, size, pos, color='black'):
+        topleft = pos
+        bottomright = (pos[0] + size[0], pos[1] + size[1])
+        ImageDraw.Draw(self.__image__).rectangle([topleft, bottomright], outline=color)
+
+    def __draw_highlight_circle__(self, size, pos, color='black'):
+        topleft = pos
+        bottomright = (pos[0] + size[0], pos[1] + size[1])
+        ImageDraw.Draw(self.__image__).ellipse([topleft, bottomright], outline=color)
\ No newline at end of file