Merge pull request #48 from kraftery/NewNewDavid

forgot to commit earlier
finished for now with the nav bar