Navbar Reorganization
Put database back in
Merge pull request #73 from calblueprint/kevin/navbar_reorganization

Navbar Reorganization