continuing implementing nav and other elements
Merge branch 'refs/heads/nav'