Updated cal page + components folder