nav changes and loader
Merge branch 'master' of https://github.com/StefanEndress/vidoo