Merge pull request #1 from fzerorubigd/master

some minor fixes
add navbar again