Fixed navigation broken links. Added layout refinements.
Merge branch 'local'