Updated ContextMenu (exception)
Added Calendar viewDisplay; fixes #40