Cleanup and calendat push states
template improvements