apply stash
merge master
fix navbar box path
Merge pull request #18 from whaambang/styling

Styling