merging Alex's version
nav style edits