Fixed EP-377 -- Site Navigation

Obsoletes #40