navbar button fixes
Merge pull request #20 from alangster/navbar

navbar button fixes