Add title and navigation to cal
Fix merge conflicts
:
Merge branch 'master' of github.com:summerc2028/FinalProject
Merge branch 'master' of github.com:summerc2028/FinalProject
Fix layout rendering for users index and new