Re-Arranged Calendar Menu, with minor fixes

Still need to have links redirect to correct calendar