Updated index and nav
Merge branch 'fix'