changed nav and sample data again
moved nav bar
Merge pull request #1 from xtol-sd/navupdate

Navupdate