More work on Calendar layouts