fix navbar
add icon navbar
fix
fix conflicts
Merge pull request #46 from bechi/fix/navbar

fix navbar