Merge pull request #24 from rocketu/layout

fixed navbar