adding calendar + some ux