Continued work on monthly view