Fix for glossary import, context not showing, and some minor formatting issues