Refactored SubjectAreas, new subnavs