Fix: NavBar Bug
fix for the previous fix :)
Merge pull request #80 from TheArchitects/last_fixes

Last fixes