Merge pull request #38 from Bkahler/master

User Model fix some changes to nav bar.
More styling