Second pass on refactor - starting to introduce new global navigation component