cleanup subnavs
cleanup subnavs
fix calendar_name