fixed toggle issue, need to add calendar and fix mailer