Add navbar state and extract inclusions