Updated context-aware nav, added SubjectAreaType