fix calendar and start working on style update