More work on sidebar calendar and modal