minor fixes to pull-req #537
Merge pull request #539 from krisrak/navbar-button

minor fixes to pull-req #537