Closes #32 Fixing navigation links