Design dev

Awesomeness with the calendar-view.

More to come.

Merging to update master