Updated week display a bit more. Ranges are now shown correctly in Mon-Sun and have been abstracted