Fix a small bug
Remove fixed for navbar
Merge pull request #8 from ehkoo/master

Fix bugs