Added calendar, glossary terms, changed layout