fixed navbar link
fixed (again) index navbar links
Merge branch 'master' into develop