nav and goals
Merge pull request #62 from ecasilla/nav

nav and goals