Added monthly view + overview + extras