Merge pull request #2 from smnguyen/skeleton

Initial navbar
temp
Skeleton done, improved nav