back on the right track, nav work coming
Merge pull request #21 from kevinuhrmacher/master

back on the right track, nav work coming