fixed navbar and some other stuff
Merge pull request #58 from ecasilla/Brad

fixed navbar and some other stuff