some changes to get switching between shopping cart and calendar working

calendar isn't drawing correctly for some reason